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

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
From: translation@xxxxxxxxxxxxxx
Date: Sun, 6 Oct 2019 02:19:19 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Sat, 05 Oct 2019 22:21:11 -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 edfc084d44c82f0587bca5a502c917a44a0a3f02
Author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Date:   Sun Oct 6 02:19:16 2019 +0000

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

diff --git a/ach.po b/ach.po
index 5fd6e41ff..1291130b6 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: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Acoli (http://www.transifex.com/otf/torproject/language/ach/)\n"
 "MIME-Version: 1.0\n"
@@ -95,80 +95,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -709,6 +523,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1091,6 +910,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/af.po b/af.po
index 55451f00e..d5de55736 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: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Afrikaans (http://www.transifex.com/otf/torproject/language/af/)\n"
 "MIME-Version: 1.0\n"
@@ -95,80 +95,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -709,6 +523,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1091,6 +910,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/ar.po b/ar.po
index 6ed164102..b990cd2d5 100644
--- a/ar.po
+++ b/ar.po
@@ -31,8 +31,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Arabic (http://www.transifex.com/otf/torproject/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -119,80 +119,82 @@ msgstr "_Launch"
 msgid "_Exit"
 msgstr "_Exit"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -200,7 +202,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -208,7 +210,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -216,225 +218,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -733,6 +547,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr "Ù?Ø°Ù? Ø§Ù?Ù?Ø³Ø®Ø© Ù?Ù? ØªÙ?Ù?Ø² ØªØØªÙ?Ù? Ù?Ø´Ø§Ù?Ù? Ø£Ù?Ù?Ù?Ø©:"
@@ -829,35 +648,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -866,14 +685,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -882,42 +701,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1115,6 +934,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/ast.po b/ast.po
index 07d6930eb..290b38d5f 100644
--- a/ast.po
+++ b/ast.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Asturian (http://www.transifex.com/otf/torproject/language/ast/)\n"
 "MIME-Version: 1.0\n"
@@ -95,80 +95,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -709,6 +523,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1091,6 +910,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/az.po b/az.po
index f3df4cd59..7d11fff7d 100644
--- a/az.po
+++ b/az.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Azerbaijani (http://www.transifex.com/otf/torproject/language/az/)\n"
 "MIME-Version: 1.0\n"
@@ -96,80 +96,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -177,7 +179,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -185,7 +187,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -193,225 +195,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -710,6 +524,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -806,35 +625,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -843,14 +662,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -859,42 +678,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1092,6 +911,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/be.po b/be.po
index efa65fcf1..e5c115f8b 100644
--- a/be.po
+++ b/be.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Belarusian (http://www.transifex.com/otf/torproject/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -95,80 +95,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -709,6 +523,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1091,6 +910,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/bg.po b/bg.po
index 19e5dcfc1..b5c631cce 100644
--- a/bg.po
+++ b/bg.po
@@ -19,8 +19,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Bulgarian (http://www.transifex.com/otf/torproject/language/bg/)\n"
 "MIME-Version: 1.0\n"
@@ -107,80 +107,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -188,7 +190,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -196,7 +198,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -204,225 +206,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -721,6 +535,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -817,35 +636,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -854,14 +673,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -870,42 +689,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1103,6 +922,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/bn.po b/bn.po
index 40fbe9433..bc0808515 100644
--- a/bn.po
+++ b/bn.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Bengali (http://www.transifex.com/otf/torproject/language/bn/)\n"
 "MIME-Version: 1.0\n"
@@ -98,80 +98,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -179,7 +181,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -187,7 +189,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -195,225 +197,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -712,6 +526,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -808,35 +627,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -845,14 +664,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -861,42 +680,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1094,6 +913,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/br.po b/br.po
index 5a6042128..94ade3fe0 100644
--- a/br.po
+++ b/br.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Breton (http://www.transifex.com/otf/torproject/language/br/)\n"
 "MIME-Version: 1.0\n"
@@ -96,80 +96,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -177,7 +179,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -185,7 +187,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -193,225 +195,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -710,6 +524,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -806,35 +625,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -843,14 +662,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -859,42 +678,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1092,6 +911,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/bs.po b/bs.po
index d32f83aae..9868c3f26 100644
--- a/bs.po
+++ b/bs.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Bosnian (http://www.transifex.com/otf/torproject/language/bs/)\n"
 "MIME-Version: 1.0\n"
@@ -95,80 +95,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -709,6 +523,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1091,6 +910,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/ca.po b/ca.po
index e7cdb94dc..bea7f78a2 100644
--- a/ca.po
+++ b/ca.po
@@ -24,8 +24,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -112,80 +112,82 @@ msgstr "_Executa"
 msgid "_Exit"
 msgstr "_Surt"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "CancelÂ·la"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "CancelÂ·la"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -193,7 +195,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -201,7 +203,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -209,225 +211,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -726,6 +540,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr "Aquesta versiÃ³ de Tails tÃ© problemes de seguretat coneguts:"
@@ -822,35 +641,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -859,14 +678,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -875,42 +694,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1108,6 +927,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/cs.po b/cs.po
index 4c33968e8..2b1e871a1 100644
--- a/cs.po
+++ b/cs.po
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n"
 "MIME-Version: 1.0\n"
@@ -108,80 +108,82 @@ msgstr "_Spustit"
 msgid "_Exit"
 msgstr "_OdejÃt"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "ZruÅ¡it"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "ZruÅ¡it"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -189,7 +191,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -197,7 +199,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -205,225 +207,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -722,6 +536,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr "Tato verze Tails obsahuje nÃ¡sledujÃcÃ bezpeÄ?nostnÃ problÃ©my:"
@@ -818,35 +637,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -855,14 +674,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -871,42 +690,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1104,6 +923,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/cy.po b/cy.po
index 4083fe5e8..af97bb779 100644
--- a/cy.po
+++ b/cy.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Welsh (http://www.transifex.com/otf/torproject/language/cy/)\n"
 "MIME-Version: 1.0\n"
@@ -98,80 +98,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -179,7 +181,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -187,7 +189,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -195,225 +197,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -712,6 +526,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -808,35 +627,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -845,14 +664,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -861,42 +680,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1094,6 +913,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/da.po b/da.po
index 74fe3e9a7..3466d2c38 100644
--- a/da.po
+++ b/da.po
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -108,80 +108,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -189,7 +191,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -197,7 +199,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -205,225 +207,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -722,6 +536,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -818,35 +637,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -855,14 +674,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -871,42 +690,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1104,6 +923,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/de.po b/de.po
index 81ac91e14..6b4583fab 100644
--- a/de.po
+++ b/de.po
@@ -36,8 +36,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -124,80 +124,82 @@ msgstr "_Start"
 msgid "_Exit"
 msgstr "_Beenden"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Abbrechen"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -205,7 +207,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -213,7 +215,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -221,225 +223,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "BestÃ¤tigen"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -738,6 +552,11 @@ msgstr ""
 msgid "Password"
 msgstr "Passwort"
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "BestÃ¤tigen"
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr "Diese Tails-Version weist SicherheitslÃ¼cken auf:"
@@ -834,35 +653,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -871,14 +690,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -887,42 +706,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1120,6 +939,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/el.po b/el.po
index df6b2828a..90953bf79 100644
--- a/el.po
+++ b/el.po
@@ -28,8 +28,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -116,80 +116,82 @@ msgstr "_Î?ÎºÎºÎ¯Î½Î·Ï?Î·"
 msgid "_Exit"
 msgstr "_Î?Î¾Î¿Î´Î¿Ï?"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -197,7 +199,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -205,7 +207,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -213,225 +215,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Î?Ï?Î¹Î²ÎµÎ²Î±Î¯Ï?Ï?Î·"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -730,6 +544,11 @@ msgstr ""
 msgid "Password"
 msgstr "Î?Ï?Î´Î¹ÎºÏ?Ï? Î±Ï?Ï?Î±Î»ÎµÎ¯Î±Ï?"
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Î?Ï?Î¹Î²ÎµÎ²Î±Î¯Ï?Ï?Î·"
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -826,35 +645,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -863,14 +682,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -879,42 +698,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1112,6 +931,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/en_GB.po b/en_GB.po
index 8e3aba645..cdf2ce9e8 100644
--- a/en_GB.po
+++ b/en_GB.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/otf/torproject/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -99,80 +99,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -180,7 +182,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -188,7 +190,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -196,225 +198,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -713,6 +527,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -809,35 +628,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -846,14 +665,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -862,42 +681,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1095,6 +914,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/eo.po b/eo.po
index 9adb998b0..395f52db2 100644
--- a/eo.po
+++ b/eo.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Esperanto (http://www.transifex.com/otf/torproject/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -96,80 +96,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -177,7 +179,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -185,7 +187,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -193,225 +195,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -710,6 +524,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -806,35 +625,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -843,14 +662,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -859,42 +678,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1092,6 +911,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/es.po b/es.po
index 9378cbee9..be9165530 100644
--- a/es.po
+++ b/es.po
@@ -17,9 +17,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 17:21+0000\n"
-"Last-Translator: eulalio barbero espinosa <eulaliob@xxxxxxxxx>\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\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"
@@ -105,80 +105,82 @@ msgstr "_Iniciar"
 msgid "_Exit"
 msgstr "_Salir"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
-msgstr "Directa (predeterminado)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Puente y proxy"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Desconectado"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "Desbloquear"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "No se pudo volver a bloquear el almacenamiento persistente."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
-msgstr "Desbloqueando..."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-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/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
 msgid "Additional Settings"
 msgstr "ConfiguraciÃ³n adicional"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
 #: config/chroot_local-includes/usr/local/bin/tor-browser:46
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
 msgid "Add"
 msgstr "AÃ±adir"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
 msgid "Back"
 msgstr "Volver"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr " _ContraseÃ±a de administraciÃ³n"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+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
+msgid "_Network Connection"
+msgstr "ConexiÃ³n de _red"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Directa (predeterminado)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Puente y proxy"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Desconectado"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "Activada (predeterminado)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Activado"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Desactivado"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr " Desactivada (predeterminado) "
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "Cerrar"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
 msgid "_Start Tails"
 msgstr "_Iniciar Tails"
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "default:LTR"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr "live-persist fallÃ³ con un cÃ³digo de retorno {returncode}:\n{stderr} "
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
 "{stderr}"
 msgstr "cryptsetup fallÃ³ con un cÃ³digo de retorno {returncode}:\n{stdout}\n{stderr} "
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -194,7 +196,7 @@ msgid ""
 "{stderr}"
 msgstr "live-persist fallÃ³ con cÃ³digo de retorno {returncode}:\n{stdout}\n{stderr} "
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -202,225 +204,37 @@ msgid ""
 "{stderr}"
 msgstr "umount fallÃ³ con un cÃ³digo de retorno {returncode}\n{stdout}\n{stderr}"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "ContraseÃ±a de administraciÃ³n"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "Establece una contraseÃ±a de administraciÃ³n si necesitas realizar tareas administrativas. De lo contrario la contraseÃ±a de administraciÃ³n se deshabilitarÃ¡ para mayor seguridad."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Introduce una contraseÃ±a de administraciÃ³n"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Confirmar"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Confirma tu contraseÃ±a de administraciÃ³n"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Deshabilitar"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Camuflaje como Windows"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "Esta opciÃ³n hace que Tails tenga el aspecto de Microsoft Windows 10. Esto puede resultar Ãºtil para evitar atraer sospechas en lugares pÃºblicos."
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "Camuflaje como Microsoft Windows 10"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "Falseamiento de direcciÃ³n MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "El falseamiento de la direcciÃ³n MAC oculta el nÃºmero de serie de tu interfaz de red (Wi-Fi o cableada) hacia la red local. Falsear la direcciÃ³n MAC generalmente es mÃ¡s seguro ya que ayuda a ocultar la ubicaciÃ³n geogrÃ¡fica. Pero tambiÃ©n podrÃa crear problemas de conectividad o resultar sospechoso."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Falsear todas las direcciones MAC (predeterminado)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "No falsear direcciones MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Â¡Bienvenido a Tails!"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "Para hacer una visita guiada a la configuraciÃ³n de Tails, pulsa <b>Hacer un recorrido</b> "
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "Desbloquear"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Idioma y regiÃ³n"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "No se pudo volver a bloquear el almacenamiento persistente."
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "ConfiguraciÃ³n predeterminada"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
+msgstr "Desbloqueando..."
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Guardar configuraciÃ³n de idioma y regional"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr "_Idioma"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: 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/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr "_Formatos"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Zona horaria"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Almacenamiento _Persistente Cifrado"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Mostrar frase-contraseÃ±a"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Configurar Almacenamiento Persistente"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-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/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Bloquear de nuevo el almacenamiento persistente"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-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/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_ConfiguraciÃ³n adicional"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Guardar configuraciÃ³n adicional "
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "AÃ±adir una configuraciÃ³n adicional"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "ConfiguraciÃ³n de la red"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "Si tu conexiÃ³n a Internet estÃ¡ censurada, filtrada, o se conecta por proxy, puedes configurar un puente de red Tor o un proxy local. Para trabajar completamente desconectado, puedes deshabilitar todas las conexiones de red."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Conectar directamente a la red Tor (predeterminado)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Configura un puente Tor o un proxy local"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Deshabilitar todas las conexiones de red "
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr " _ContraseÃ±a de administraciÃ³n"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr " Desactivada (predeterminado) "
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_Falseamiento de direcciÃ³n MAC "
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "Activada (predeterminado)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "ConexiÃ³n de _red"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "Camuflaje como _Windows"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Activado"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Desactivado"
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -719,6 +533,11 @@ msgstr "Establece una contraseÃ±a para desbloquear la pantalla"
 msgid "Password"
 msgstr "ContraseÃ±a"
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Confirmar"
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr "Esta versiÃ³n de Tails tiene problemas de seguridad conocidos:"
@@ -815,35 +634,35 @@ msgstr "Abrir Onion Circuits"
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr "{volume_label} ({volume_size})"
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr "{partition_name} ({partition_size})"
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr "{volume_size} Volumen"
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr "{volume_name} (SÃ³lo lectura)"
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr "{partition_name} en {container_path}"
@@ -852,14 +671,14 @@ msgstr "{partition_name} en {container_path}"
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr "{volume_name} â?? {path_to_file_container}"
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr "{partition_name} en {drive_name}"
@@ -868,42 +687,42 @@ msgstr "{partition_name} en {drive_name}"
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr "{volume_name} â?? {drive_name}"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr "ContraseÃ±a o parÃ¡metros incorrectos"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr "Error al desbloquear el volumen"
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr "No se pudo desbloquear el volumen {volume_name}:\n{error_message}"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr "Una o mÃ¡s aplicaciones tienen el volumen ocupado."
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr "No se pudo bloquear el volumen {volume_name}:\n{error_message}"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr "El bloqueo del volumen fallÃ³"
 
@@ -1101,6 +920,130 @@ msgid ""
 " ($(command_line))"
 msgstr "Se requiere autenticaciÃ³n para quitar un paquete de su software adicional ($ (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:669
+msgid "Administration Password"
+msgstr "ContraseÃ±a de administraciÃ³n"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "Establece una contraseÃ±a de administraciÃ³n si necesitas realizar tareas administrativas. De lo contrario la contraseÃ±a de administraciÃ³n se deshabilitarÃ¡ para mayor seguridad."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Introduce una contraseÃ±a de administraciÃ³n"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Confirma tu contraseÃ±a de administraciÃ³n"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr "Falseamiento de direcciÃ³n MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "El falseamiento de la direcciÃ³n MAC oculta el nÃºmero de serie de tu interfaz de red (Wi-Fi o cableada) hacia la red local. Falsear la direcciÃ³n MAC generalmente es mÃ¡s seguro ya que ayuda a ocultar la ubicaciÃ³n geogrÃ¡fica. Pero tambiÃ©n podrÃa crear problemas de conectividad o resultar sospechoso."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Falsear todas las direcciones MAC (predeterminado)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr "ConfiguraciÃ³n de la red"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "Si tu conexiÃ³n a Internet estÃ¡ censurada, filtrada, o se conecta por proxy, puedes configurar un puente de red Tor o un proxy local. Para trabajar completamente desconectado, puedes deshabilitar todas las conexiones de red."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Conectar directamente a la red Tor (predeterminado)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Configura un puente Tor o un proxy local"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Deshabilitar todas las conexiones de red "
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr "Â¡Bienvenido a Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Idioma y regiÃ³n"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "ConfiguraciÃ³n predeterminada"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Almacenamiento _Persistente Cifrado"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Configurar Almacenamiento 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:410
+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:456
+msgid "Relock Persistent Storage"
+msgstr "Bloquear de nuevo el almacenamiento persistente"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+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:509
+msgid "_Additional Settings"
+msgstr "_ConfiguraciÃ³n adicional"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "AÃ±adir una configuraciÃ³n adicional"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/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 662beee46..e12504cd7 100644
--- a/es_AR.po
+++ b/es_AR.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/otf/torproject/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
@@ -101,80 +101,82 @@ msgstr "_Iniciar"
 msgid "_Exit"
 msgstr "_Salir"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Cancelar"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -182,7 +184,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -190,7 +192,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -198,225 +200,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Confirmar"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -715,6 +529,11 @@ msgstr "DefinÃ una contraseÃ±a para desbloquear la pantalla."
 msgid "Password"
 msgstr "ContraseÃ±a"
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Confirmar"
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr "Esta versiÃ³n de Tails tiene problemas de seguridad conocidos:"
@@ -811,35 +630,35 @@ msgstr "Abrir circuitos Onion"
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr "{volume_label} ({volume_size})"
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr "{partition_name} ({partition_size})"
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr "{volume_size} Volumen"
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr "{volume_name} (SÃ³lo-Lectura)"
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr "{partition_name} en {container_path}"
@@ -848,14 +667,14 @@ msgstr "{partition_name} en {container_path}"
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr "{volume_name} â?? {path_to_file_container}"
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr "{partition_name} en {drive_name}"
@@ -864,42 +683,42 @@ msgstr "{partition_name} en {drive_name}"
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr "{volume_name} â?? {drive_name}"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr "Frase de contraseÃ±a o parÃ¡metros errÃ³neos"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr "Error desbloqueando volumen"
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr "No se pudo desbloquear volumen {volume_name}:\n{error_message}"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1097,6 +916,130 @@ msgid ""
 " ($(command_line))"
 msgstr "Se requiere autenticaciÃ³n para remover un paquete de tus programas adicionales ($(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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/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 2313fbc23..087ed06fd 100644
--- a/es_MX.po
+++ b/es_MX.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Spanish (Mexico) (http://www.transifex.com/otf/torproject/language/es_MX/)\n"
 "MIME-Version: 1.0\n"
@@ -97,80 +97,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -178,7 +180,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -194,225 +196,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -711,6 +525,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -807,35 +626,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -844,14 +663,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -860,42 +679,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1093,6 +912,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/et.po b/et.po
index e43ea178a..31da6b404 100644
--- a/et.po
+++ b/et.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Estonian (http://www.transifex.com/otf/torproject/language/et/)\n"
 "MIME-Version: 1.0\n"
@@ -97,80 +97,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -178,7 +180,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -194,225 +196,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -711,6 +525,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -807,35 +626,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -844,14 +663,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -860,42 +679,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1093,6 +912,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/eu.po b/eu.po
index 6e1fd73c4..f056e4a2f 100644
--- a/eu.po
+++ b/eu.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Basque (http://www.transifex.com/otf/torproject/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -102,80 +102,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -183,7 +185,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -191,7 +193,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -199,225 +201,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -716,6 +530,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -812,35 +631,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -849,14 +668,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -865,42 +684,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1098,6 +917,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/fa.po b/fa.po
index d721c99a8..e16cdc089 100644
--- a/fa.po
+++ b/fa.po
@@ -33,8 +33,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Persian (http://www.transifex.com/otf/torproject/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -121,80 +121,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -202,7 +204,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -210,7 +212,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -218,225 +220,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -735,6 +549,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -831,35 +650,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -868,14 +687,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -884,42 +703,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1117,6 +936,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/fi.po b/fi.po
index e2337b57f..94d05f381 100644
--- a/fi.po
+++ b/fi.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Finnish (http://www.transifex.com/otf/torproject/language/fi/)\n"
 "MIME-Version: 1.0\n"
@@ -105,80 +105,82 @@ msgstr "_KÃ¤ynnistÃ¤"
 msgid "_Exit"
 msgstr "_Lopeta"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "Peruuta"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Peruuta"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -194,7 +196,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -202,225 +204,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -719,6 +533,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr "TÃ¤ssÃ¤ Tails-versiossa on tunnettuja turvallisuusriskejÃ¤:"
@@ -815,35 +634,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -852,14 +671,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -868,42 +687,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1101,6 +920,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/fr.po b/fr.po
index 6d618f2a3..696ce466a 100644
--- a/fr.po
+++ b/fr.po
@@ -39,8 +39,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -127,80 +127,82 @@ msgstr "_Lancer"
 msgid "_Exit"
 msgstr "_Quitter"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
-msgstr "Directe (par dÃ©faut)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Pont (bridge) et  serveur mandataire (proxy)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Hors ligne"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "DÃ©verrouiller"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Ã?chec de reverrouillage du stockage persistant."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
-msgstr "DÃ©verrouillage..."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-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/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
 msgid "Additional Settings"
 msgstr "ParamÃ¨tres supplÃ©mentaires"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
 #: config/chroot_local-includes/usr/local/bin/tor-browser:46
 msgid "Cancel"
 msgstr "Annuler"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
 msgid "Add"
 msgstr "Ajouter"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
 msgid "Back"
 msgstr "PrÃ©cÃ©dent"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "_Mot de passe dâ??administration"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_Usurpation dâ??adresse MAC"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "Connexion _rÃ©seau"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Directe (par dÃ©faut)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Pont (bridge) et  serveur mandataire (proxy)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Hors ligne"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "ActivÃ© (par dÃ©faut)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "ActivÃ©"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "DÃ©sactivÃ©"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "DÃ©sactivÃ© (par dÃ©faut)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "Ã?teindre"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
 msgid "_Start Tails"
 msgstr "_DÃ©marrer Tails"
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "default:LTR"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr "Ã?chec de live-persist avec le code de retour {returncode}:\n{stderr}"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -208,7 +210,7 @@ msgid ""
 "{stderr}"
 msgstr "cryptsetup a Ã©chouÃ© avec le code de retour {returncode} :\n{stdout}\n{stderr}"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -216,7 +218,7 @@ msgid ""
 "{stderr}"
 msgstr "Ã?chec de live-persist avec le code de retour {returncode}:\n{stdout}\n{stderr}"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -224,225 +226,37 @@ msgid ""
 "{stderr}"
 msgstr "umount a Ã©chouÃ© avec le code de retour {returncode} :\n{stdout}\n{stderr}"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "Mot de passe dâ??administration"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "DÃ©finir un mot de passe dâ??administration si vous devez effectuer des tÃ¢ches administratives. Sinon, le mot de passe dâ??administration est dÃ©sactivÃ© pour une sÃ©curitÃ© accrue."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Saisir un mot de passe dâ??administration"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Confirmer"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Confirmer votre mot de passe dâ??administration"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "DÃ©sactiver"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Camouflage Windows"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "Avec cette option, Tails ressemble Ã  Microsoft Windows 10, ce qui peut se rÃ©vÃ©ler utile pour Ã©viter dâ??attirer les soupÃ§ons dans les lieux publics."
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "Camouflage en Microsoft Windows 10"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "Usurpation dâ??adresse MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "Lâ??usurpation dâ??adresse MAC dissimule au rÃ©seau local le numÃ©ro de sÃ©rie de votre interface rÃ©seau (Wi-Fi ou filaire). Lâ??usurpation dâ??adresse MAC est gÃ©nÃ©ralement plus sÃ»re, car elle vous aide Ã  dissimuler votre position gÃ©ographique. Mais elle peut aussi crÃ©er des problÃ¨mes de connectivitÃ© et sembler suspect."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Usurper toutes les adresses MAC (par dÃ©faut)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "Ne pas usurper les adresses MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "Vous configurerez le pont (bridge) Tor et le serveur mandataire (proxy) local plus tard, aprÃ¨s vous Ãªtre connectÃ© Ã  un rÃ©seau."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Bienvenue dans Tails !"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "Pour dÃ©couvrir les paramÃ¨tres de Tails, cliquez sur <b>Visite guidÃ©e</b> ci-dessus"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "DÃ©verrouiller"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Langue et rÃ©gion"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Ã?chec de reverrouillage du stockage persistant."
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "ParamÃ¨tres par dÃ©faut"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
+msgstr "DÃ©verrouillage..."
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Enregistrer les paramÃ¨tres de langue et de rÃ©gion"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr "_Langue"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: 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/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr "_Formats"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "Fuseau _horaire"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "_Stockage persistant chiffrÃ©"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Afficher la phrase de passe"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Configurer le stockage persistant"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-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/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Reverrouiller le stockage persistant"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-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/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_ParamÃ¨tres supplÃ©mentaires"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Enregistrer les paramÃ¨tres supplÃ©mentaires"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Ajouter un paramÃ¨tre supplÃ©mentaire"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "Configuration du rÃ©seau"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "Si votre connexion Internet est censurÃ©e, filtrÃ©e ou relayÃ©e par un serveur mandataire (proxy), vous pouvez configurer un pont (bridge) Tor ou un serveur mandataire (proxy) local. Pour travailler complÃ¨tement hors ligne, vous pouvez dÃ©sactiver le rÃ©seau."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Se connecter directement au rÃ©seau Tor (par dÃ©faut)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Configurer un pont (bridge) Tor ou un serveur mandataire (proxy) local"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "DÃ©sactiver le rÃ©seau"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Mot de passe dâ??administration"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "DÃ©sactivÃ© (par dÃ©faut)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_Usurpation dâ??adresse MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "ActivÃ© (par dÃ©faut)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "Connexion _rÃ©seau"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "Camouflage _Windows"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "ActivÃ©"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "DÃ©sactivÃ©"
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -741,6 +555,11 @@ msgstr "DÃ©finir un mot de passe pour dÃ©verrouiller lâ??Ã©cran"
 msgid "Password"
 msgstr "Mot de passe"
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Confirmer"
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr "Cette version de Tails a des problÃ¨mes de sÃ©curitÃ© connus :"
@@ -837,35 +656,35 @@ msgstr "Ouvrir Onion Circuits"
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr "{volume_label} ({volume_size})"
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr "{partition_name} ({partition_size})"
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr "Volume de {volume_size}"
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr "{volume_name} (lecture seule)"
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr "{partition_name} dans {container_path}"
@@ -874,14 +693,14 @@ msgstr "{partition_name} dans {container_path}"
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr "{volume_name} â?? {path_to_file_container}"
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr "{partition_name} sur {drive_name}"
@@ -890,42 +709,42 @@ msgstr "{partition_name} sur {drive_name}"
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr "{volume_name} â?? {drive_name}"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr "Mauvaise phrase de passe ou mauvais paramÃ¨tres"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr "Erreur de dÃ©verrouillage du volume"
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr "Impossible de dÃ©verrouiller le volume {volume_name}Â :\n{error_message}"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr "Une ou plusieurs applications tiennent le volume occupÃ©."
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr "Impossible de verrouiller le volume {volume_name}Â :\n{error_message}"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr "Ã?chec de verrouillage du volume"
 
@@ -1123,6 +942,130 @@ msgid ""
 " ($(command_line))"
 msgstr "Une authentification est nÃ©cessaire pour enlever un paquet depuis vos logiciels additionnels ($(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:669
+msgid "Administration Password"
+msgstr "Mot de passe dâ??administration"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "DÃ©finir un mot de passe dâ??administration si vous devez effectuer des tÃ¢ches administratives. Sinon, le mot de passe dâ??administration est dÃ©sactivÃ© pour une sÃ©curitÃ© accrue."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Saisir un mot de passe dâ??administration"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Confirmer votre mot de passe dâ??administration"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr "Usurpation dâ??adresse MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "Lâ??usurpation dâ??adresse MAC dissimule au rÃ©seau local le numÃ©ro de sÃ©rie de votre interface rÃ©seau (Wi-Fi ou filaire). Lâ??usurpation dâ??adresse MAC est gÃ©nÃ©ralement plus sÃ»re, car elle vous aide Ã  dissimuler votre position gÃ©ographique. Mais elle peut aussi crÃ©er des problÃ¨mes de connectivitÃ© et sembler suspect."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Usurper toutes les adresses MAC (par dÃ©faut)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr "Configuration du rÃ©seau"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "Si votre connexion Internet est censurÃ©e, filtrÃ©e ou relayÃ©e par un serveur mandataire (proxy), vous pouvez configurer un pont (bridge) Tor ou un serveur mandataire (proxy) local. Pour travailler complÃ¨tement hors ligne, vous pouvez dÃ©sactiver le rÃ©seau."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Se connecter directement au rÃ©seau Tor (par dÃ©faut)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Configurer un pont (bridge) Tor ou un serveur mandataire (proxy) local"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "DÃ©sactiver le rÃ©seau"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "Vous configurerez le pont (bridge) Tor et le serveur mandataire (proxy) local plus tard, aprÃ¨s vous Ãªtre connectÃ© Ã  un rÃ©seau."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Bienvenue dans Tails !"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Langue et rÃ©gion"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "ParamÃ¨tres par dÃ©faut"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "_Stockage persistant chiffrÃ©"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Configurer le stockage persistant"
+
+#. 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:410
+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:456
+msgid "Relock Persistent Storage"
+msgstr "Reverrouiller le stockage persistant"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+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:509
+msgid "_Additional Settings"
+msgstr "_ParamÃ¨tres supplÃ©mentaires"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Ajouter un paramÃ¨tre supplÃ©mentaire"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "Fichiers conteneurs"
diff --git a/fy.po b/fy.po
index 669ef74f0..1f4407c2e 100644
--- a/fy.po
+++ b/fy.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Western Frisian (http://www.transifex.com/otf/torproject/language/fy/)\n"
 "MIME-Version: 1.0\n"
@@ -96,80 +96,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -177,7 +179,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -185,7 +187,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -193,225 +195,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -710,6 +524,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -806,35 +625,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -843,14 +662,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -859,42 +678,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1092,6 +911,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/ga.po b/ga.po
index 87ae7ab04..5093acd47 100644
--- a/ga.po
+++ b/ga.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Irish (http://www.transifex.com/otf/torproject/language/ga/)\n"
 "MIME-Version: 1.0\n"
@@ -97,80 +97,82 @@ msgstr "_Tosaigh"
 msgid "_Exit"
 msgstr "_Scoir"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "Cealaigh"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Cealaigh"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -178,7 +180,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -194,225 +196,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Deimhnigh"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -711,6 +525,11 @@ msgstr "Socraigh focal faire chun an scÃ¡ileÃ¡n a dhÃghlasÃ¡il."
 msgid "Password"
 msgstr "Focal faire"
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Deimhnigh"
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr "TÃ¡ fadhbanna slÃ¡ndÃ¡la sa leagan seo de Tails:"
@@ -807,35 +626,35 @@ msgstr "Ciorcaid Onion Oscailte"
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr "{volume_label} ({volume_size})"
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr "{partition_name} ({partition_size})"
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr "Imleabhar {volume_size}"
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr "{volume_name} (InlÃ©ite AmhÃ¡in)"
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr "{partition_name} in {container_path}"
@@ -844,14 +663,14 @@ msgstr "{partition_name} in {container_path}"
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr "{volume_name} â?? {path_to_file_container}"
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr "{partition_name} ar {drive_name}"
@@ -860,42 +679,42 @@ msgstr "{partition_name} ar {drive_name}"
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr "{volume_name} â?? {drive_name}"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr "FrÃ¡sa faire mÃcheart nÃ³ paraimÃ©adair mhÃchearta"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr "EarrÃ¡id agus an t-imleabhar Ã¡ dhÃghlasÃ¡il"
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr "NÃorbh fhÃ©idir imleabhar {volume_name}: a dhÃghlasÃ¡il:\n{error_message}"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1093,6 +912,130 @@ msgid ""
 " ($(command_line))"
 msgstr "Caithfidh tÃº d'fhocal faire a thabhairt chun pacÃ¡iste de na bogearraÃ breise a bhaint ($(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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "CoimeÃ¡dÃ¡in"
diff --git a/gd.po b/gd.po
index 3a7e0f742..86c4cfae1 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: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Gaelic, Scottish (http://www.transifex.com/otf/torproject/language/gd/)\n"
 "MIME-Version: 1.0\n"
@@ -95,80 +95,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -709,6 +523,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1091,6 +910,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/gl.po b/gl.po
index ef276cd67..8c3167aaf 100644
--- a/gl.po
+++ b/gl.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Galician (http://www.transifex.com/otf/torproject/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -98,80 +98,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -179,7 +181,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -187,7 +189,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -195,225 +197,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -712,6 +526,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -808,35 +627,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -845,14 +664,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -861,42 +680,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1094,6 +913,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/gu.po b/gu.po
index 9af2cc746..088fddc81 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: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Gujarati (http://www.transifex.com/otf/torproject/language/gu/)\n"
 "MIME-Version: 1.0\n"
@@ -95,80 +95,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -709,6 +523,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1091,6 +910,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/he.po b/he.po
index 7aff3d8d2..1268d380c 100644
--- a/he.po
+++ b/he.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -102,80 +102,82 @@ msgstr "_×?×¤×¢×?"
 msgid "_Exit"
 msgstr "_×¦×?"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "×?×?×?"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "×?×?×?"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -183,7 +185,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -191,7 +193,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -199,225 +201,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "×?×©×¨"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -716,6 +530,11 @@ msgstr "×§×?×¢ ×¡×?×¡×?×? ×?×?×?×?×?×? × ×¢×?×?×ª ×?×?×¡×?."
 msgid "Password"
 msgstr "×¡×?×¡×?×?"
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "×?×©×¨"
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr "×?×?×¨×¡×? ×?×? ×©×? Tails ×?×© ×¡×?×?×?×?×ª ×?×?×?×?×? ×?×?×?×¢×?×ª:"
@@ -812,35 +631,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -849,14 +668,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -865,42 +684,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1098,6 +917,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/hi.po b/hi.po
index 6bad25c4d..df20a2b92 100644
--- a/hi.po
+++ b/hi.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Hindi (http://www.transifex.com/otf/torproject/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -97,80 +97,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -178,7 +180,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -194,225 +196,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -711,6 +525,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -807,35 +626,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -844,14 +663,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -860,42 +679,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1093,6 +912,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/hr.po b/hr.po
index f6b127956..4918a7ac2 100644
--- a/hr.po
+++ b/hr.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Croatian (http://www.transifex.com/otf/torproject/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -96,80 +96,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -177,7 +179,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -185,7 +187,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -193,225 +195,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -710,6 +524,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -806,35 +625,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -843,14 +662,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -859,42 +678,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1092,6 +911,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/hu.po b/hu.po
index 74e4d3db9..b887c4377 100644
--- a/hu.po
+++ b/hu.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/hu/)\n"
 "MIME-Version: 1.0\n"
@@ -104,80 +104,82 @@ msgstr "_IndÃtÃ¡s"
 msgid "_Exit"
 msgstr "_KilÃ©pÃ©s"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "MÃ©gse"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "MÃ©gse"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -185,7 +187,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -193,7 +195,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -201,225 +203,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "MegerÅ?sÃt"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -718,6 +532,11 @@ msgstr "Adjon meg jelszÃ³t a kÃ©pernyÅ? feloldÃ¡shoz."
 msgid "Password"
 msgstr "JelszÃ³"
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "MegerÅ?sÃt"
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr "A Tails ezen verziÃ³ja ismert biztonsÃ¡gi problÃ©mÃ¡kkal rendelkezik:"
@@ -814,35 +633,35 @@ msgstr "Nyitott Onion Ã?ramkÃ¶rÃ¶k"
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr "{volume_label} ({volume_size})"
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr "{partition_name} ({partition_size})"
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr "{volume_size} Volume"
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr "{volume_name} (csak olvashatÃ³)"
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr "{partition_name} a {container_path} Ãºtvonalon"
@@ -851,14 +670,14 @@ msgstr "{partition_name} a {container_path} Ãºtvonalon"
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr "{volume_name} â?? {path_to_file_container}"
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr "{partition_name} a {drive_name} drive-on"
@@ -867,42 +686,42 @@ msgstr "{partition_name} a {drive_name} drive-on"
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr "{volume_name} â?? {drive_name}"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr "Rossz jelszÃ³ vagy paramÃ©terek"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr "Hiba a kÃ¶tet feloldÃ¡sa sorÃ¡n"
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr "Sikertelen a(z) {volume_name} kÃ¶tet feloldÃ¡sa:\n{error_message}"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1100,6 +919,130 @@ msgid ""
 " ($(command_line))"
 msgstr "AzonosÃtÃ¡s szÃ¼ksÃ©ges a tovÃ¡bbi szoftverei kÃ¶zÃ¼l egy csomag eltÃ¡volÃtÃ¡sÃ¡hoz ($(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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "FÃ¡jl kontÃ©nerek"
diff --git a/hy.po b/hy.po
index 111c154d3..a847b3861 100644
--- a/hy.po
+++ b/hy.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Armenian (http://www.transifex.com/otf/torproject/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -96,80 +96,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -177,7 +179,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -185,7 +187,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -193,225 +195,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -710,6 +524,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -806,35 +625,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -843,14 +662,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -859,42 +678,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1092,6 +911,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/id.po b/id.po
index f9cfafa36..1d8c85ec8 100644
--- a/id.po
+++ b/id.po
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Indonesian (http://www.transifex.com/otf/torproject/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -108,80 +108,82 @@ msgstr "_Luncurkan"
 msgid "_Exit"
 msgstr "_Keluar"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -189,7 +191,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -197,7 +199,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -205,225 +207,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -722,6 +536,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -818,35 +637,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -855,14 +674,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -871,42 +690,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1104,6 +923,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/is.po b/is.po
index e7e214ce5..23c7814f7 100644
--- a/is.po
+++ b/is.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Icelandic (http://www.transifex.com/otf/torproject/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -96,80 +96,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -177,7 +179,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -185,7 +187,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -193,225 +195,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -710,6 +524,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -806,35 +625,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -843,14 +662,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -859,42 +678,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1092,6 +911,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/it.po b/it.po
index 62d5f4abc..f36330f6f 100644
--- a/it.po
+++ b/it.po
@@ -32,8 +32,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Italian (http://www.transifex.com/otf/torproject/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -120,80 +120,82 @@ msgstr "_Avvia"
 msgid "_Exit"
 msgstr "_Esci"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
-msgstr "Diretta (predefinito)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
 msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
 #: config/chroot_local-includes/usr/local/bin/tor-browser:46
 msgid "Cancel"
 msgstr "Annulla"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
 msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
 msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "_Password di amministratore"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "Spoofing indirizzo _MAC"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_Connessioni di rete"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Diretta (predefinito)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "On (predefinito)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "On"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Off"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Off (predefinito)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -201,7 +203,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -209,7 +211,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -217,225 +219,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Conferma"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Configura volume persistente"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-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/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Riblocca volume persistente"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-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/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_Impostazioni aggiuntive"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "Configurazione di rete"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Password di amministratore"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "Off (predefinito)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "Spoofing indirizzo _MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "On (predefinito)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_Connessioni di rete"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "Mimetizzazione _Windows"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "On"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Off"
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -734,6 +548,11 @@ msgstr "Imposta una password per sbloccare lo schermo."
 msgid "Password"
 msgstr "Password"
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Conferma"
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr "Questa versione di Tails ha problemi di sicurezza noti:"
@@ -830,35 +649,35 @@ msgstr "Apri Circuiti Onion"
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr "{volume_label} ({volume_size})"
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr "{partition_name} ({partition_size})"
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr "{volume_size} Volume"
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr "{volume_name} (Sola lettura)"
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr "{partition_name} in {container_path}"
@@ -867,14 +686,14 @@ msgstr "{partition_name} in {container_path}"
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr "{volume_name} â?? {path_to_file_container}"
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr "{partition_name} su {drive_name}"
@@ -883,42 +702,42 @@ msgstr "{partition_name} su {drive_name}"
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr "{volume_name} â?? {drive_name}"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr "Password o parametri non corretti"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr "Errore sblocco volume"
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr "Impossibile sbloccare il volume {volume_name}:\n{error_message}"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr "Una o piÃ¹ applicazioni stanno tenendo occupato il volume."
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr "Impossibile bloccare il volume {volume_name}:\n{error_message}"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr "Blocco del volume fallito"
 
@@ -1116,6 +935,130 @@ msgid ""
 " ($(command_line))"
 msgstr "Ã? richiesta l'autenticazione per rimuovere un pacchetto dai tuoi software aggiuntivi ($(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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr "Configurazione di rete"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Configura volume 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:410
+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:456
+msgid "Relock Persistent Storage"
+msgstr "Riblocca volume persistente"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+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:509
+msgid "_Additional Settings"
+msgstr "_Impostazioni aggiuntive"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "Contenitori di file"
diff --git a/ja.po b/ja.po
index 6bc6d09b0..3f3e4c14a 100644
--- a/ja.po
+++ b/ja.po
@@ -26,8 +26,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Japanese (http://www.transifex.com/otf/torproject/language/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -114,80 +114,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -195,7 +197,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -203,7 +205,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -211,225 +213,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -728,6 +542,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -824,35 +643,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -861,14 +680,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -877,42 +696,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1110,6 +929,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/ka.po b/ka.po
index 45692db4d..a66027b99 100644
--- a/ka.po
+++ b/ka.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Georgian (http://www.transifex.com/otf/torproject/language/ka/)\n"
 "MIME-Version: 1.0\n"
@@ -98,80 +98,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -179,7 +181,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -187,7 +189,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -195,225 +197,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -712,6 +526,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -808,35 +627,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -845,14 +664,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -861,42 +680,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1094,6 +913,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/kab.po b/kab.po
index cb869557c..feb1c5e98 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: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Kabyle (http://www.transifex.com/otf/torproject/language/kab/)\n"
 "MIME-Version: 1.0\n"
@@ -95,80 +95,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -709,6 +523,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1091,6 +910,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/kk.po b/kk.po
index d14cc7187..3d028e9ae 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: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Kazakh (http://www.transifex.com/otf/torproject/language/kk/)\n"
 "MIME-Version: 1.0\n"
@@ -97,80 +97,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -178,7 +180,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -194,225 +196,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -711,6 +525,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -807,35 +626,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -844,14 +663,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -860,42 +679,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1093,6 +912,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/km.po b/km.po
index ee5ea8989..1abffbc9f 100644
--- a/km.po
+++ b/km.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Khmer (http://www.transifex.com/otf/torproject/language/km/)\n"
 "MIME-Version: 1.0\n"
@@ -97,80 +97,82 @@ msgstr "á??á?¶á??á??á??á??á??á?¾á??"
 msgid "_Exit"
 msgstr "á??á??á??"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "á??á??á??á??á??á??"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "á??á??á??á??á??á??"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -178,7 +180,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -194,225 +196,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -711,6 +525,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr "á??á??á??á??â??á??á??á??á?? Tails á??á??á??â??á??á?ºâ??á??á??á??á?¶á??á??â??á??á??á??á? á?¶â??á??á?»á??á??á??á??á?·á??á?¶á??á??"
@@ -807,35 +626,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -844,14 +663,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -860,42 +679,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1093,6 +912,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/kn.po b/kn.po
index 3a8964141..9379377e3 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: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Kannada (http://www.transifex.com/otf/torproject/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -96,80 +96,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -177,7 +179,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -185,7 +187,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -193,225 +195,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -710,6 +524,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -806,35 +625,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -843,14 +662,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -859,42 +678,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1092,6 +911,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/ko.po b/ko.po
index 5638cdbc1..fa376bdda 100644
--- a/ko.po
+++ b/ko.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Korean (http://www.transifex.com/otf/torproject/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -103,80 +103,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -192,7 +194,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -200,225 +202,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -717,6 +531,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -813,35 +632,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -850,14 +669,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -866,42 +685,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1099,6 +918,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/lt.po b/lt.po
index 2a4f8372d..1e05fdcb4 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: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 18:31+0000\n"
-"Last-Translator: Moo\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\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"
@@ -98,80 +98,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "Atsisakyti"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Atsisakyti"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -179,7 +181,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -187,7 +189,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -195,225 +197,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Patvirtinkite"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -712,6 +526,11 @@ msgstr "Nusistatykite slaptaÅ¾odÄ¯ ekrano atrakinimui."
 msgid "Password"
 msgstr "SlaptaÅ¾odis"
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Patvirtinkite"
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr "Å ioje Tails versijoje yra Å¾inomos saugumo problemos:"
@@ -808,35 +627,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -845,14 +664,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr "{volume_name} â?? {path_to_file_container}"
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -861,42 +680,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr "{volume_name} â?? {drive_name}"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr "Neteisinga slaptafrazÄ? arba parametrai"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr "Klaida atrakinant tomÄ?"
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1094,6 +913,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/lv.po b/lv.po
index 211278d63..f38c86d30 100644
--- a/lv.po
+++ b/lv.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Latvian (http://www.transifex.com/otf/torproject/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -97,80 +97,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -178,7 +180,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -194,225 +196,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -711,6 +525,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -807,35 +626,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -844,14 +663,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -860,42 +679,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1093,6 +912,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/mk.po b/mk.po
index 44ee23925..64121d2f3 100644
--- a/mk.po
+++ b/mk.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Macedonian (http://www.transifex.com/otf/torproject/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -96,80 +96,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -177,7 +179,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -185,7 +187,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -193,225 +195,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -710,6 +524,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -806,35 +625,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -843,14 +662,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -859,42 +678,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1092,6 +911,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/ml.po b/ml.po
index e012d8b5a..56952b9c6 100644
--- a/ml.po
+++ b/ml.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Malayalam (http://www.transifex.com/otf/torproject/language/ml/)\n"
 "MIME-Version: 1.0\n"
@@ -97,80 +97,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -178,7 +180,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -194,225 +196,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -711,6 +525,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -807,35 +626,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -844,14 +663,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -860,42 +679,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1093,6 +912,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/mr.po b/mr.po
index d03ea7c84..8eda8ac72 100644
--- a/mr.po
+++ b/mr.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Marathi (http://www.transifex.com/otf/torproject/language/mr/)\n"
 "MIME-Version: 1.0\n"
@@ -97,80 +97,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -178,7 +180,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -194,225 +196,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -711,6 +525,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -807,35 +626,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -844,14 +663,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -860,42 +679,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1093,6 +912,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/ms_MY.po b/ms_MY.po
index 8398a2180..c7a0ed2cb 100644
--- a/ms_MY.po
+++ b/ms_MY.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/otf/torproject/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -99,80 +99,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -180,7 +182,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -188,7 +190,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -196,225 +198,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -713,6 +527,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -809,35 +628,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -846,14 +665,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -862,42 +681,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1095,6 +914,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/my.po b/my.po
index 154f5bc81..e9e9e0f92 100644
--- a/my.po
+++ b/my.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Burmese (http://www.transifex.com/otf/torproject/language/my/)\n"
 "MIME-Version: 1.0\n"
@@ -95,80 +95,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -709,6 +523,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1091,6 +910,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/nb.po b/nb.po
index f7803889f..b2e11f212 100644
--- a/nb.po
+++ b/nb.po
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Norwegian BokmÃ¥l (http://www.transifex.com/otf/torproject/language/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -108,80 +108,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -189,7 +191,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -197,7 +199,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -205,225 +207,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -722,6 +536,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -818,35 +637,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -855,14 +674,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -871,42 +690,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1104,6 +923,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/ne.po b/ne.po
index 9d072a9d3..34f554c1b 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: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Nepali (http://www.transifex.com/otf/torproject/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -95,80 +95,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -709,6 +523,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1091,6 +910,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/nl.po b/nl.po
index 11cedc542..22e32e03e 100644
--- a/nl.po
+++ b/nl.po
@@ -34,9 +34,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 18:59+0000\n"
-"Last-Translator: Meteor 0id\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\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"
@@ -122,80 +122,82 @@ msgstr "_Starten"
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "Annuleren"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
+msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Annuleren"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Offline"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -203,7 +205,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -211,7 +213,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -219,225 +221,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -736,6 +550,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -832,35 +651,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -869,14 +688,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -885,42 +704,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1118,6 +937,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/nl_BE.po b/nl_BE.po
index cfe64575d..b40a287fb 100644
--- a/nl_BE.po
+++ b/nl_BE.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/otf/torproject/language/nl_BE/)\n"
 "MIME-Version: 1.0\n"
@@ -97,80 +97,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -178,7 +180,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -194,225 +196,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -711,6 +525,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -807,35 +626,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -844,14 +663,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -860,42 +679,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1093,6 +912,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/nn.po b/nn.po
index eecbdd856..60d62db74 100644
--- a/nn.po
+++ b/nn.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Norwegian Nynorsk (http://www.transifex.com/otf/torproject/language/nn/)\n"
 "MIME-Version: 1.0\n"
@@ -97,80 +97,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -178,7 +180,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -194,225 +196,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -711,6 +525,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -807,35 +626,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -844,14 +663,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -860,42 +679,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1093,6 +912,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/oc.po b/oc.po
index 9215a66db..793c797c1 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: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/otf/torproject/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -95,80 +95,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -709,6 +523,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1091,6 +910,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/or.po b/or.po
index 420ed7562..37b74281b 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: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Oriya (http://www.transifex.com/otf/torproject/language/or/)\n"
 "MIME-Version: 1.0\n"
@@ -95,80 +95,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -709,6 +523,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1091,6 +910,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/pa.po b/pa.po
index 295ef8948..3ca862ac7 100644
--- a/pa.po
+++ b/pa.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/otf/torproject/language/pa/)\n"
 "MIME-Version: 1.0\n"
@@ -96,80 +96,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -177,7 +179,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -185,7 +187,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -193,225 +195,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -710,6 +524,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -806,35 +625,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -843,14 +662,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -859,42 +678,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1092,6 +911,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/pl.po b/pl.po
index fc86bf447..33d500c80 100644
--- a/pl.po
+++ b/pl.po
@@ -24,8 +24,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Polish (http://www.transifex.com/otf/torproject/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -112,80 +112,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -193,7 +195,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -201,7 +203,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -209,225 +211,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -726,6 +540,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -822,35 +641,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -859,14 +678,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -875,42 +694,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1108,6 +927,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/pt_BR.po b/pt_BR.po
index 4999ee8a0..1e071224b 100644
--- a/pt_BR.po
+++ b/pt_BR.po
@@ -32,8 +32,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -120,80 +120,82 @@ msgstr "_LanÃ§ar"
 msgid "_Exit"
 msgstr "_SaÃda"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Ponte & Proxy"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Offline"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "Desbloquear"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Falha ao rebloquear o volume de armazenamento persistente."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
-msgstr "Desbloqueando..."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-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/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
 msgid "Additional Settings"
 msgstr "ConfiguraÃ§Ãµes Adicionais"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
 #: config/chroot_local-includes/usr/local/bin/tor-browser:46
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
 msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
 msgid "Back"
 msgstr "Anterior"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "_Senha de AdministraÃ§Ã£o"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Ponte & Proxy"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Offline"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "Encerrar"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
 msgid "_Start Tails"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -201,7 +203,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -209,7 +211,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -217,225 +219,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "Senha de AdministraÃ§Ã£o"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "Crie uma senha de administraÃ§Ã£o caso vocÃª precise realizar tarefas administrativas.\nCaso contrÃ¡rio, para garantir uma maior seguranÃ§a, essa funÃ§Ã£o serÃ¡ desabilitada ."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Inserir uma senha de administraÃ§Ã£o"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Confirmar"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Confirmar a sua senha de administraÃ§Ã£o"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Desabilitar"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Camuflagem Windows"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "Esta opÃ§Ã£o faz com que o Tails fique parecido com o Microsoft Windows 10, o que pode ser Ãºtil para evitar suspeitas em lugares pÃºblicos.  "
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "Camuflagem Microsoft Windows 10"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "_Mascaragem de endereÃ§os MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "A Mascaragem de endereÃ§os MAC ocultarÃ¡ da rede local o nÃºmero de sÃ©rie da sua interface de rede (Wi-Fi ou cabo). Mascarar endereÃ§os MAC Ã© em geral mais seguro, porque permite ocultar a sua localizaÃ§Ã£o geogrÃ¡fica. PorÃ©m, essa opÃ§Ã£o pode gerar problemas de conexÃ£o ou parecer suspeita."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Mascarar todos os endereÃ§os MAC (padrÃ£o)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "NÃ£o mascarar endereÃ§os MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Boas-vindas ao Tails!"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "Se vocÃª desejar um guia das configuraÃ§Ãµes do Tails, clique em <b>Guia</b>, acima"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "Desbloquear"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Idioma & RegiÃ£o"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Falha ao rebloquear o volume de armazenamento persistente."
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "ConfiguraÃ§Ãµes-PadrÃ£o"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
+msgstr "Desbloqueando..."
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Salvar ConfiguraÃ§Ãµes de Idioma & RegiÃ£o"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr "_Idioma"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: 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/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr "_Formatos"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Zona HorÃ¡ria"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Criptografado_ Armazenamento Persistente"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Mostrar Frase secreta"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Configurar o Dispositivo de 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/greeter.ui:1065
-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/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Rebloquear o Dispositivo de Armazenamento Persistente"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-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/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_ConfiguraÃ§Ãµes Adicionais"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Salvar ConfiguraÃ§Ãµes Adicionais"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Adicionar uma configuraÃ§Ã£o adicional"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "ConfiguraÃ§Ã£o de Rede"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "Se a sua conexÃ£o de Internet estiver censurada, filtrada ou sob proxy, vocÃª pode configurar uma ponte Tor ou um proxy local. Para trabalhar totalmente offline, Ã© preciso desabilitar toda conexÃ£o de rede."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Conectar-se diretamente Ã  rede Tor (padrÃ£o)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Configurar uma ponte Tor ou um proxy local"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Desativar toda conexÃ£o de rede"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Senha de AdministraÃ§Ã£o"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -734,6 +548,11 @@ msgstr ""
 msgid "Password"
 msgstr "Senha"
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Confirmar"
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr "Esta versÃ£o do Tails tem problemas de seguranÃ§a conhecidos:"
@@ -830,35 +649,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -867,14 +686,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -883,42 +702,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1116,6 +935,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr "Senha de AdministraÃ§Ã£o"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "Crie uma senha de administraÃ§Ã£o caso vocÃª precise realizar tarefas administrativas.\nCaso contrÃ¡rio, para garantir uma maior seguranÃ§a, essa funÃ§Ã£o serÃ¡ desabilitada ."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Inserir uma senha de administraÃ§Ã£o"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Confirmar a sua senha de administraÃ§Ã£o"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr "_Mascaragem de endereÃ§os MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "A Mascaragem de endereÃ§os MAC ocultarÃ¡ da rede local o nÃºmero de sÃ©rie da sua interface de rede (Wi-Fi ou cabo). Mascarar endereÃ§os MAC Ã© em geral mais seguro, porque permite ocultar a sua localizaÃ§Ã£o geogrÃ¡fica. PorÃ©m, essa opÃ§Ã£o pode gerar problemas de conexÃ£o ou parecer suspeita."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Mascarar todos os endereÃ§os MAC (padrÃ£o)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr "ConfiguraÃ§Ã£o de Rede"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "Se a sua conexÃ£o de Internet estiver censurada, filtrada ou sob proxy, vocÃª pode configurar uma ponte Tor ou um proxy local. Para trabalhar totalmente offline, Ã© preciso desabilitar toda conexÃ£o de rede."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Conectar-se diretamente Ã  rede Tor (padrÃ£o)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Configurar uma ponte Tor ou um proxy local"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Desativar toda conexÃ£o de rede"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr "Boas-vindas ao Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Idioma & RegiÃ£o"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "ConfiguraÃ§Ãµes-PadrÃ£o"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Criptografado_ Armazenamento Persistente"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Configurar o Dispositivo de 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:410
+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:456
+msgid "Relock Persistent Storage"
+msgstr "Rebloquear o Dispositivo de Armazenamento Persistente"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+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:509
+msgid "_Additional Settings"
+msgstr "_ConfiguraÃ§Ãµes Adicionais"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Adicionar uma configuraÃ§Ã£o adicional"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/pt_PT.po b/pt_PT.po
index 32d000e7b..0ff0fbaee 100644
--- a/pt_PT.po
+++ b/pt_PT.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/otf/torproject/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -100,80 +100,82 @@ msgstr "_Iniciar"
 msgid "_Exit"
 msgstr "_Sair"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Cancelar"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -181,7 +183,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -189,7 +191,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -197,225 +199,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -714,6 +528,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr "Esta versÃ£o do Tails tem alguns problemas de seguranÃ§a conhecidos:"
@@ -810,35 +629,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -847,14 +666,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -863,42 +682,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1096,6 +915,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/ro.po b/ro.po
index d7f7f13b7..7827fd562 100644
--- a/ro.po
+++ b/ro.po
@@ -25,8 +25,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Romanian (http://www.transifex.com/otf/torproject/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -113,80 +113,82 @@ msgstr "_Lansare"
 msgid "_Exit"
 msgstr "_Iesire"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "Anulare"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Anulare"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -194,7 +196,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -202,7 +204,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -210,225 +212,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "ConfirmÄ?"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -727,6 +541,11 @@ msgstr "SetaÈ?i o parolÄ? pentru a debloca ecranul."
 msgid "Password"
 msgstr "Parola"
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "ConfirmÄ?"
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr "AceastÄ? versiune Tails are probleme de securitate cunoscute:"
@@ -823,35 +642,35 @@ msgstr "Circuite Onion Deschise"
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr "{volume_label} ({volume_size})"
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr "{partition_name} ({partition_size})"
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr "{volume_size} Volum"
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr "{volume_name} (Read-Only)"
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr "{partition_name} Ã®n {container_path}"
@@ -860,14 +679,14 @@ msgstr "{partition_name} Ã®n {container_path}"
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr "{volume_name} â?? {path_to_file_container}"
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr "{partition_name} pe {drive_name}"
@@ -876,42 +695,42 @@ msgstr "{partition_name} pe {drive_name}"
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr "{volume_name} â?? {drive_name}"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr "FrazÄ? de access sau parametri greÈ?iti"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr "Eroare la deblocarea volumului"
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr "Nu s-a putut debloca volumul {volume_name}:\n{error_message}"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1109,6 +928,130 @@ msgid ""
 " ($(command_line))"
 msgstr "AveÈ?i nevoie de autentificare pentru a elimina un pachet din aplicaÈ?iile adiÈ?ionale ($(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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "Containere de FiÈ?iere"
diff --git a/ru.po b/ru.po
index bed306393..ae6b90fb0 100644
--- a/ru.po
+++ b/ru.po
@@ -37,8 +37,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -125,80 +125,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -206,7 +208,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -214,7 +216,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -222,225 +224,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -739,6 +553,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -835,35 +654,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -872,14 +691,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -888,42 +707,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1121,6 +940,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/si_LK.po b/si_LK.po
index 7c690fb77..db4c63284 100644
--- a/si_LK.po
+++ b/si_LK.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/otf/torproject/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -95,80 +95,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -709,6 +523,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1091,6 +910,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/sk.po b/sk.po
index 7bba08f83..922a4ad18 100644
--- a/sk.po
+++ b/sk.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Slovak (http://www.transifex.com/otf/torproject/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -103,80 +103,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -192,7 +194,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -200,225 +202,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -717,6 +531,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -813,35 +632,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -850,14 +669,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -866,42 +685,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1099,6 +918,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/sl.po b/sl.po
index 050b3ca39..30829caef 100644
--- a/sl.po
+++ b/sl.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Slovenian (http://www.transifex.com/otf/torproject/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -96,80 +96,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -177,7 +179,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -185,7 +187,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -193,225 +195,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -710,6 +524,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -806,35 +625,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -843,14 +662,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -859,42 +678,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1092,6 +911,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/son.po b/son.po
index cff489f94..6bcad58b4 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: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Songhay (http://www.transifex.com/otf/torproject/language/son/)\n"
 "MIME-Version: 1.0\n"
@@ -95,80 +95,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -709,6 +523,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1091,6 +910,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/sq.po b/sq.po
index 2b33065c2..0eceb4659 100644
--- a/sq.po
+++ b/sq.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Albanian (http://www.transifex.com/otf/torproject/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -97,80 +97,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -178,7 +180,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -194,225 +196,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -711,6 +525,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -807,35 +626,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -844,14 +663,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -860,42 +679,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1093,6 +912,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/sr.po b/sr.po
index 8a3b66e8f..0a94974b4 100644
--- a/sr.po
+++ b/sr.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Serbian (http://www.transifex.com/otf/torproject/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -99,80 +99,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -180,7 +182,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -188,7 +190,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -196,225 +198,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -713,6 +527,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -809,35 +628,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -846,14 +665,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -862,42 +681,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1095,6 +914,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/sv.po b/sv.po
index 2ecb7d901..26d8359bf 100644
--- a/sv.po
+++ b/sv.po
@@ -24,8 +24,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -112,80 +112,82 @@ msgstr "_Starta"
 msgid "_Exit"
 msgstr "_Avsluta"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Avbryt"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -193,7 +195,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -201,7 +203,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -209,225 +211,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "BekrÃ¤fta"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -726,6 +540,11 @@ msgstr "StÃ¤ll in ett lÃ¶senord fÃ¶r att lÃ¥sa upp skÃ¤rmen."
 msgid "Password"
 msgstr "LÃ¶senord"
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "BekrÃ¤fta"
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr "Det finns kÃ¤nda sÃ¤kerhetsproblem i den hÃ¤r Tails versionen:"
@@ -822,35 +641,35 @@ msgstr "Ã?ppna Onion-kretsar"
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr "{volume_label} ({volume_size})"
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr "{partition_name} ({partition_size})"
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr "{volume_size} Volym"
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr "{volume_name} (Skrivskyddad)"
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr "{partition_name} i {container_path}"
@@ -859,14 +678,14 @@ msgstr "{partition_name} i {container_path}"
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr "{volume_name} â?? {path_to_file_container}"
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr "{partition_name} pÃ¥ {drive_name}"
@@ -875,42 +694,42 @@ msgstr "{partition_name} pÃ¥ {drive_name}"
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr "{volume_name} â?? {drive_name}"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr "Fel lÃ¶senfras eller parametrar"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr "Ett fel uppstod vid upplÃ¥sning av volymen"
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr "Kunde inte lÃ¥sa upp volymen {volume_name}:\n{error_message}"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1108,6 +927,130 @@ msgid ""
 " ($(command_line))"
 msgstr "Autentisering krÃ¤vs fÃ¶r att ta bort ett paket frÃ¥n dina extra program ($(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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "FilbehÃ¥llare"
diff --git a/sw.po b/sw.po
index 3dc370078..e4945cdcd 100644
--- a/sw.po
+++ b/sw.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Swahili (http://www.transifex.com/otf/torproject/language/sw/)\n"
 "MIME-Version: 1.0\n"
@@ -95,80 +95,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -709,6 +523,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1091,6 +910,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/ta.po b/ta.po
index 07c0c4b9c..2eba20591 100644
--- a/ta.po
+++ b/ta.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Tamil (http://www.transifex.com/otf/torproject/language/ta/)\n"
 "MIME-Version: 1.0\n"
@@ -97,80 +97,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -178,7 +180,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -194,225 +196,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -711,6 +525,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -807,35 +626,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -844,14 +663,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -860,42 +679,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1093,6 +912,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/tails.pot b/tails.pot
index c08782e3c..ae43b4b32 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: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: English (http://www.transifex.com/otf/torproject/language/en/)\n"
 "MIME-Version: 1.0\n"
@@ -95,80 +95,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -709,6 +523,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1091,6 +910,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/te.po b/te.po
index ff58a0918..16c12f301 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: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Telugu (http://www.transifex.com/otf/torproject/language/te/)\n"
 "MIME-Version: 1.0\n"
@@ -95,80 +95,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -709,6 +523,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1091,6 +910,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/th.po b/th.po
index ae45ef86e..afa92a77b 100644
--- a/th.po
+++ b/th.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Thai (http://www.transifex.com/otf/torproject/language/th/)\n"
 "MIME-Version: 1.0\n"
@@ -100,80 +100,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -181,7 +183,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -189,7 +191,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -197,225 +199,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -714,6 +528,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -810,35 +629,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -847,14 +666,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -863,42 +682,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1096,6 +915,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/tr.po b/tr.po
index 8389444d5..1f39550f3 100644
--- a/tr.po
+++ b/tr.po
@@ -29,8 +29,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -117,80 +117,82 @@ msgstr "_BaÅ?lat"
 msgid "_Exit"
 msgstr "Ã?Ä±_kÄ±Å?"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
-msgstr "DoÄ?rudan (varsayÄ±lan)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "KÃ¶prÃ¼ ve Vekil Sunucu"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Ã?evrimdÄ±Å?Ä±"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "Kilidi AÃ§"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "KalÄ±cÄ± depolama yeniden kilitlenemedi."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
-msgstr "Kilit aÃ§Ä±lÄ±yor..."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-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/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
 msgid "Additional Settings"
 msgstr "Ek Ayarlar"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
 #: config/chroot_local-includes/usr/local/bin/tor-browser:46
 msgid "Cancel"
 msgstr "Ä°ptal"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
 msgid "Add"
 msgstr "Ekle"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
 msgid "Back"
 msgstr "Geri"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "_YÃ¶netim ParolasÄ±"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_MAC Adresi YanÄ±ltmasÄ±"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_AÄ? BaÄ?lantÄ±sÄ±"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "DoÄ?rudan (varsayÄ±lan)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "KÃ¶prÃ¼ ve Vekil Sunucu"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Ã?evrimdÄ±Å?Ä±"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "AÃ§Ä±k (varsayÄ±lan)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "AÃ§Ä±k"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "KapalÄ±"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "KapalÄ± (varsayÄ±lan)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "Kapat"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
 msgid "_Start Tails"
 msgstr "_Tails BaÅ?lat"
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "default:LTR"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr "live-persist Å?u hata kodu ile yÃ¼rÃ¼tÃ¼lemedi {returncode}:\n{stderr}"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -198,7 +200,7 @@ msgid ""
 "{stderr}"
 msgstr "cryptsetup Å?u hata kodu ile yÃ¼rÃ¼tÃ¼lemedi {returncode}:\n{stdout}\n{stderr}"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -206,7 +208,7 @@ msgid ""
 "{stderr}"
 msgstr "live-persist Å?u hata kodu ile yÃ¼rÃ¼tÃ¼lemedi {returncode}:\n{stdout}\n{stderr}"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -214,225 +216,37 @@ msgid ""
 "{stderr}"
 msgstr "umount Å?u hata kodu ile yÃ¼rÃ¼tÃ¼lemedi {returncode}:\n{stdout}\n{stderr}"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "YÃ¶netici ParolasÄ±"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "YÃ¶netim iÅ?lemleri yapacaksanÄ±z bir yÃ¶netim parolasÄ± yazÄ±n. Yoksa gÃ¼venlik iÃ§in yÃ¶netim parolasÄ± devre dÄ±Å?Ä± bÄ±rakÄ±lÄ±r."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "YÃ¶netim parolasÄ±nÄ± yazÄ±n"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Onayla"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "YÃ¶netim parolasÄ±nÄ± onaylayÄ±n"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Devre DÄ±Å?Ä± BÄ±rak"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Windows Gizlenmesi"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "Bu seÃ§enek Tails gÃ¶rÃ¼nÃ¼mÃ¼nÃ¼n Microsoft Windows 10 gibi gÃ¶rÃ¼nmesini saÄ?lar. Bu Ã¶zellik, herkese aÃ§Ä±k yerlerde Å?Ã¼pheli gÃ¶rÃ¼nmekten kaÃ§Ä±nmak iÃ§in kullanÄ±Å?lÄ± olabilir."
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "Microsoft Windows 10 Gizlenmesi"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "MAC Adresi YanÄ±ltmasÄ±"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "MAC adreslerini yanÄ±ltmasÄ± aÄ? kartlarÄ±nÄ±zÄ±n (Wi-FÄ° ya da kablolu) seri numarasÄ±nÄ± yerel aÄ?lardan gizler. Bu Ã¶zellik coÄ?rafi konumunuzu gizlemenize yardÄ±mcÄ± olacaÄ?Ä±ndan genellikle daha fazla gÃ¼venlik saÄ?lar. Bununla birlikte baÄ?lanma sorunlarÄ±na ya da Å?Ã¼pheli olarak algÄ±lanmanÄ±za yol aÃ§abilir."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "TÃ¼m MAC adresleri yanÄ±ltÄ±lsÄ±n (varsayÄ±lan)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "MAC adresleri yanÄ±ltÄ±lmasÄ±n"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Tails UygulamasÄ±na HoÅ? Geldiniz!"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "Tails ayarlarÄ±nÄ± yapmak iÃ§in yukarÄ±dan <b>Tura KatÄ±lÄ±n</b>"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "Kilidi AÃ§"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Dil ve BÃ¶lge"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "KalÄ±cÄ± depolama yeniden kilitlenemedi."
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "VarsayÄ±lan Ayarlar"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
+msgstr "Kilit aÃ§Ä±lÄ±yor..."
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Dil ve BÃ¶lge AyarlarÄ±nÄ± Kaydet"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr "_Dil"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: 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/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr "_BiÃ§imler"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Saat Dilimi"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Å?ifreli _KalÄ±cÄ± Depolama"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Parola GÃ¶rÃ¼ntÃ¼lensin"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "KalÄ±cÄ± Depolama YapÄ±landÄ±rmasÄ±"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-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/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "KalÄ±cÄ± DepolamayÄ± Yeniden Kilitle"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-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/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_Ek Ayarlar"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Ek AyarlarÄ± Kaydet"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Ek bir ayar ekle"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "AÄ? YapÄ±landÄ±rmasÄ±"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "Ä°nternet baÄ?lantÄ±nÄ±z sansÃ¼rleniyor, sÃ¼zÃ¼lÃ¼yor ya da vekil sunucu kullanÄ±yorsa, bir Tor kÃ¶prÃ¼sÃ¼ ya da yerel vekil sunucu yapÄ±landÄ±rabilirsiniz. TamamÄ±yla Ã§evrimdÄ±Å?Ä± Ã§alÄ±Å?mak iÃ§in, tÃ¼m aÄ?larÄ± devre dÄ±Å?Ä± bÄ±rakabilirsiniz."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "DoÄ?rudan Tor aÄ?Ä±na baÄ?lanÄ±lsÄ±n (varsayÄ±lan)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Bir Tor kÃ¶prÃ¼sÃ¼ ya da vekil sunucu yapÄ±landÄ±r"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "TÃ¼m aÄ? devre dÄ±Å?Ä± bÄ±rakÄ±lsÄ±n"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_YÃ¶netim ParolasÄ±"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "KapalÄ± (varsayÄ±lan)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_MAC Adresi YanÄ±ltmasÄ±"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "AÃ§Ä±k (varsayÄ±lan)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_AÄ? BaÄ?lantÄ±sÄ±"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Windows Gizlenmesi"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "AÃ§Ä±k"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "KapalÄ±"
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -731,6 +545,11 @@ msgstr "Ekran kilidini aÃ§mak iÃ§in bir parola ayarlayÄ±n."
 msgid "Password"
 msgstr "Parola"
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Onayla"
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr "Bu Tails sÃ¼rÃ¼mÃ¼nde bilinen bazÄ± gÃ¼venlik sorunlarÄ± var: "
@@ -827,35 +646,35 @@ msgstr "AÃ§Ä±k Onion Devreleri"
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr "{volume_label} ({volume_size})"
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr "{partition_name} ({partition_size})"
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr "{volume_size} Birim"
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr "{volume_name} (Salt Okunur)"
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr "{container_path} iÃ§indeki {partition_name}"
@@ -864,14 +683,14 @@ msgstr "{container_path} iÃ§indeki {partition_name}"
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr "{volume_name} â?? {path_to_file_container}"
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr "{drive_name} Ã¼zerindeki {partition_name}"
@@ -880,42 +699,42 @@ msgstr "{drive_name} Ã¼zerindeki {partition_name}"
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr "{volume_name} â?? {drive_name}"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr "Parola ya da parametreler hatalÄ±"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr "Birim kilidi aÃ§Ä±lÄ±rken sorun Ã§Ä±ktÄ±"
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr "{volume_name} biriminin kilidi aÃ§Ä±lamadÄ±:\n{error_message}"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr "Bir ya da birkaÃ§ uygulama bu birimi meÅ?gul ediyor."
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr "Birim kilitlenemedi {volume_name}:\n{error_message}"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr "Birim kilitlenemedi"
 
@@ -1113,6 +932,130 @@ msgid ""
 " ($(command_line))"
 msgstr "Ek yazÄ±lÄ±mlarÄ±nÄ±zdan bir paket kaldÄ±rmak iÃ§in kimlik doÄ?rulamasÄ± gerekir ($(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:669
+msgid "Administration Password"
+msgstr "YÃ¶netici ParolasÄ±"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "YÃ¶netim iÅ?lemleri yapacaksanÄ±z bir yÃ¶netim parolasÄ± yazÄ±n. Yoksa gÃ¼venlik iÃ§in yÃ¶netim parolasÄ± devre dÄ±Å?Ä± bÄ±rakÄ±lÄ±r."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "YÃ¶netim parolasÄ±nÄ± yazÄ±n"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "YÃ¶netim parolasÄ±nÄ± onaylayÄ±n"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr "MAC Adresi YanÄ±ltmasÄ±"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "MAC adreslerini yanÄ±ltmasÄ± aÄ? kartlarÄ±nÄ±zÄ±n (Wi-FÄ° ya da kablolu) seri numarasÄ±nÄ± yerel aÄ?lardan gizler. Bu Ã¶zellik coÄ?rafi konumunuzu gizlemenize yardÄ±mcÄ± olacaÄ?Ä±ndan genellikle daha fazla gÃ¼venlik saÄ?lar. Bununla birlikte baÄ?lanma sorunlarÄ±na ya da Å?Ã¼pheli olarak algÄ±lanmanÄ±za yol aÃ§abilir."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "TÃ¼m MAC adresleri yanÄ±ltÄ±lsÄ±n (varsayÄ±lan)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr "AÄ? YapÄ±landÄ±rmasÄ±"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "Ä°nternet baÄ?lantÄ±nÄ±z sansÃ¼rleniyor, sÃ¼zÃ¼lÃ¼yor ya da vekil sunucu kullanÄ±yorsa, bir Tor kÃ¶prÃ¼sÃ¼ ya da yerel vekil sunucu yapÄ±landÄ±rabilirsiniz. TamamÄ±yla Ã§evrimdÄ±Å?Ä± Ã§alÄ±Å?mak iÃ§in, tÃ¼m aÄ?larÄ± devre dÄ±Å?Ä± bÄ±rakabilirsiniz."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "DoÄ?rudan Tor aÄ?Ä±na baÄ?lanÄ±lsÄ±n (varsayÄ±lan)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Bir Tor kÃ¶prÃ¼sÃ¼ ya da vekil sunucu yapÄ±landÄ±r"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "TÃ¼m aÄ? devre dÄ±Å?Ä± bÄ±rakÄ±lsÄ±n"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr "Tails UygulamasÄ±na HoÅ? Geldiniz!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Dil ve BÃ¶lge"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "VarsayÄ±lan Ayarlar"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Å?ifreli _KalÄ±cÄ± Depolama"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "KalÄ±cÄ± Depolama YapÄ±landÄ±rmasÄ±"
+
+#. 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:410
+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:456
+msgid "Relock Persistent Storage"
+msgstr "KalÄ±cÄ± DepolamayÄ± Yeniden Kilitle"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+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:509
+msgid "_Additional Settings"
+msgstr "_Ek Ayarlar"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Ek bir ayar ekle"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "Dosya KapsayÄ±cÄ±larÄ±"
diff --git a/uk.po b/uk.po
index 2d129f6dc..064612f76 100644
--- a/uk.po
+++ b/uk.po
@@ -18,8 +18,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/otf/torproject/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -106,80 +106,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -187,7 +189,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -195,7 +197,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -203,225 +205,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -720,6 +534,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -816,35 +635,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -853,14 +672,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -869,42 +688,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1102,6 +921,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/ur.po b/ur.po
index 4ed76aa2b..61680baa5 100644
--- a/ur.po
+++ b/ur.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Urdu (http://www.transifex.com/otf/torproject/language/ur/)\n"
 "MIME-Version: 1.0\n"
@@ -96,80 +96,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -177,7 +179,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -185,7 +187,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -193,225 +195,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -710,6 +524,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -806,35 +625,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -843,14 +662,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -859,42 +678,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1092,6 +911,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/uz.po b/uz.po
index 677efcacf..79a3bcf29 100644
--- a/uz.po
+++ b/uz.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Uzbek (http://www.transifex.com/otf/torproject/language/uz/)\n"
 "MIME-Version: 1.0\n"
@@ -95,80 +95,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -709,6 +523,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1091,6 +910,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/vi.po b/vi.po
index a7f555206..204f3aa18 100644
--- a/vi.po
+++ b/vi.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/otf/torproject/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -97,80 +97,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -178,7 +180,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -194,225 +196,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -711,6 +525,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -807,35 +626,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -844,14 +663,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -860,42 +679,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1093,6 +912,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/zh_CN.po b/zh_CN.po
index 17b07fbff..810b964c4 100644
--- a/zh_CN.po
+++ b/zh_CN.po
@@ -31,8 +31,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -119,80 +119,82 @@ msgstr "å?¯å?¨(_L)"
 msgid "_Exit"
 msgstr "é??å?º(_E)"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
-msgstr "ç?´æ?¥ï¼?é»?è®¤ï¼?"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "ç½?æ¡¥å??ä»£ç??"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "è?±æ?º"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "è§£é??"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "é??æ?°é??å®?æ??ä¹?å?å?¨å¤±è´¥ã??"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
-msgstr "æ£å?¨è§£é??â?¦"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "æ? æ³?ç?¨æ¤å¯?ç ?è§£é??å? å¯?ç??å?å?¨ã??"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
 msgid "Additional Settings"
 msgstr "é¢?å¤?è®¾ç½®"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
 #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
 #: config/chroot_local-includes/usr/local/bin/tor-browser:46
 msgid "Cancel"
 msgstr "å??æ¶?"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
 msgid "Add"
 msgstr "æ·»å? "
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
 msgid "Back"
 msgstr "å??é??"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "ç®¡ç??å??å¯?ç ?(_A)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "MAC å?°å??æ¬ºéª?(_M)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "ç½?ç»?è¿?æ?¥(_N)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "ç?´æ?¥ï¼?é»?è®¤ï¼?"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "ç½?æ¡¥å??ä»£ç??"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "è?±æ?º"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "å¼?å?¯ï¼?é»?è®¤ï¼?"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "å¼?"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "å?³"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "å?³é?ï¼?é»?è®¤ï¼?"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "å?³é?"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
 msgid "_Start Tails"
 msgstr "å?¯å?¨ Tails(_S)"
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "default:LTR"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr "å?¯å?¨æ??ä¹?å?å?¨å¤±è´¥ï¼?è¿?å??ä»£ç ? {returncode}:\n{stderr}"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -200,7 +202,7 @@ msgid ""
 "{stderr}"
 msgstr "å? å¯?è®¾ç½®å¤±è´¥ï¼?è¿?å??ä»£ç ?  {returncode}:\n{stdout}\n{stderr}"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -208,7 +210,7 @@ msgid ""
 "{stderr}"
 msgstr "å?¯å?¨æ??ä¹?å?å?¨å¤±è´¥ï¼?è¿?å??ä»£ç ? {returncode}ï¼?\n{stdout}\n{stderr}"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -216,225 +218,37 @@ msgid ""
 "{stderr}"
 msgstr "æ??è½½å¤±è´¥ï¼?è¿?å??ä»£ç ? {returncode}:\n{stdout}\n{stderr}"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "ç®¡ç??å¯?ç ?"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "å¦?æ??æ?¨é??è¦?æ?§è¡?ç®¡ç??ä»»å?¡ï¼?è¯·è®¾ç½®ä¸?ä¸ªç®¡ç??å¯?ç ?ã??å?¦å??ï¼?ç¦?ç?¨ç®¡ç??å¯?ç ?ä»¥å??å¾?æ?´é«?å®?å?¨æ?§ã??"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "è¯·è¾?å?¥ç®¡ç??å¯?ç ?"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "ç¡®è®¤"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "ç¡®è®¤æ?¨ç??ç®¡ç??å¯?ç ?"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "ç¦?ç?¨"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Windows ä¼ªè£?"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "æ¤é??é¡¹å°?ä½¿ Tails ç??èµ·æ?¥å??æ?¯ Microsoft Windows 10ã??è¿?æ??å?©äº?é?¿å??å?¨å?¬å?±å?ºæ??å¼?èµ·æ³¨æ??ã??"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "Microsoft Windows 10 ä¼ªè£?"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "MAC å?°å??æ¬ºéª?"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "MAC å?°å??æ¬ºéª?å??æ?¬å?°ç½?ç»?é??è??æ?¨ç??ç½?ç»?æ?¥å?£ï¼?Wi-Fi æ??æ??çº¿ç½?ç»?ï¼?ç??åº?å??å?·ã??æ¬ºéª? MAC å?°å??é??å¸¸æ?´å®?å?¨ï¼?æ??å?©äº?æ?¨é??è??æ?¨ç??å?°ç??ä½?ç½®ã??ä½?å®?ä¹?å?¯è?½é? æ??è¿?æ?¥é?®é¢?æ??ç??èµ·æ?¥å?¯ç??ã??"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "æ¬ºéª?æ??æ?? MAC å?°å??ï¼?é»?è®¤ï¼?"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "ä¸?æ¬ºéª?ä»»ä½? MAC å?°å??"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "æ¬¢è¿?ä½¿ç?¨ Tailsï¼?"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "è¦?è?·å?? Tails è®¾ç½®ç??æ??å??ï¼?ç?¹å?»ä¸?é?¢ç??<b>å¯¼è§?</b>"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "è§£é??"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "è¯è¨?å??å?ºå??"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "é??æ?°é??å®?æ??ä¹?å?å?¨å¤±è´¥ã??"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "é»?è®¤è®¾ç½®"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
+msgstr "æ£å?¨è§£é??â?¦"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "ä¿?å?è¯è¨?å??å?ºå??è®¾ç½®"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr "è¯è¨?(_L)"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: 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/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr "æ ¼å¼?(_F)"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "æ?¶å?º(_T)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "å? å¯?ç??æ??ä¹?å?å?¨(_P)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "æ?¾ç¤ºå¯?ç ?"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "è¯·è¾?å?¥æ?¨ç??å¯?ç ?ä»¥è§£é??æ??ä¹?å?å?¨"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "é??æ?°é??å®?æ??ä¹?å?å?¨"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "æ?¨ç??æ??ä¹?å?å?¨å·²è§£é??ã??é??å?¯ Tails ä»¥å??æ¬¡é??å®?å®?ã??"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "é??å? è®¾ç½®(_A)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "ä¿?å?é¢?å¤?è®¾ç½®"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "æ·»å? ä¸?ä¸ªé¢?å¤?è®¾ç½®"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "ç½?ç»?é??ç½®"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "å¦?æ??æ?¨ç??äº?è??ç½?è¿?æ?¥å??å?°å®¡æ?¥ã??è¿?æ»¤æ??è??é??è¿?ä»£ç??æ??å?¡å?¨ï¼?æ?¨å?¯ä»¥é??ç½®ä¸?ä¸ª Tor ç½?æ¡¥æ??æ?¬å?°ä»£ç??ã??è¦?å®?å?¨è?±æ?ºå·¥ä½?ï¼?æ?¨å?¯ä»¥ç¦?ç?¨æ??æ??ç½?ç»?ã??"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "ç?´æ?¥è¿?æ?¥ Tor ç½?ç»?ï¼?é»?è®¤ï¼?"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "é??ç½® Tor ç½?æ¡¥æ??æ?¬å?°ä»£ç??"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "ç¦?ç?¨æ??æ??ç½?ç»?"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "ç®¡ç??å??å¯?ç ?(_A)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "å?³é?ï¼?é»?è®¤ï¼?"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "MAC å?°å??æ¬ºéª?(_M)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "å¼?å?¯ï¼?é»?è®¤ï¼?"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "ç½?ç»?è¿?æ?¥(_N)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "ä¼ªè£? Windows(_W)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "å¼?"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "å?³"
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -733,6 +547,11 @@ msgstr "è®¾å®?è§£é??å±?å¹?ç??å¯?ç ?"
 msgid "Password"
 msgstr "å¯?ç ?"
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "ç¡®è®¤"
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr "è¯¥ç??æ?¬ Tails ç??å·²ç?¥å®?å?¨é?®é¢?ï¼?"
@@ -829,35 +648,35 @@ msgstr "æ??å¼? Onion é?¾è·¯"
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr "{volume_label} ({volume_size})"
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr "{partition_name} ({partition_size})"
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr "{volume_size} å?·"
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr "{volume_name} (å?ªè¯»)"
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr "{container_path} ä¸ç?? {partition_name}"
@@ -866,14 +685,14 @@ msgstr "{container_path} ä¸ç?? {partition_name}"
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr "{path_to_file_container} - {volume_name}"
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr "{drive_name} ä¸?ç?? {partition_name}"
@@ -882,42 +701,42 @@ msgstr "{drive_name} ä¸?ç?? {partition_name}"
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr "{drive_name} - {volume_name}"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr "å?£ä»¤æ??å??æ?°é??è¯¯"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr "è§£é??å? å¯?å?·å?ºé??"
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr "æ? æ³?è§£é??å? å¯?å?·{volume_name}:\n{error_message}"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr "ä¸?ä¸ªæ??æ?´å¤?åº?ç?¨è?´ä½¿å?·æ£å¿?ã??"
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr "æ? æ³?é??å®?å?·{volume_name}:\n{error_message}"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr "é??å®?å?·å¤±è´¥"
 
@@ -1115,6 +934,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr "ç®¡ç??å¯?ç ?"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "å¦?æ??æ?¨é??è¦?æ?§è¡?ç®¡ç??ä»»å?¡ï¼?è¯·è®¾ç½®ä¸?ä¸ªç®¡ç??å¯?ç ?ã??å?¦å??ï¼?ç¦?ç?¨ç®¡ç??å¯?ç ?ä»¥å??å¾?æ?´é«?å®?å?¨æ?§ã??"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "è¯·è¾?å?¥ç®¡ç??å¯?ç ?"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "ç¡®è®¤æ?¨ç??ç®¡ç??å¯?ç ?"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr "MAC å?°å??æ¬ºéª?"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "MAC å?°å??æ¬ºéª?å??æ?¬å?°ç½?ç»?é??è??æ?¨ç??ç½?ç»?æ?¥å?£ï¼?Wi-Fi æ??æ??çº¿ç½?ç»?ï¼?ç??åº?å??å?·ã??æ¬ºéª? MAC å?°å??é??å¸¸æ?´å®?å?¨ï¼?æ??å?©äº?æ?¨é??è??æ?¨ç??å?°ç??ä½?ç½®ã??ä½?å®?ä¹?å?¯è?½é? æ??è¿?æ?¥é?®é¢?æ??ç??èµ·æ?¥å?¯ç??ã??"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "æ¬ºéª?æ??æ?? MAC å?°å??ï¼?é»?è®¤ï¼?"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr "ç½?ç»?é??ç½®"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "å¦?æ??æ?¨ç??äº?è??ç½?è¿?æ?¥å??å?°å®¡æ?¥ã??è¿?æ»¤æ??è??é??è¿?ä»£ç??æ??å?¡å?¨ï¼?æ?¨å?¯ä»¥é??ç½®ä¸?ä¸ª Tor ç½?æ¡¥æ??æ?¬å?°ä»£ç??ã??è¦?å®?å?¨è?±æ?ºå·¥ä½?ï¼?æ?¨å?¯ä»¥ç¦?ç?¨æ??æ??ç½?ç»?ã??"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "ç?´æ?¥è¿?æ?¥ Tor ç½?ç»?ï¼?é»?è®¤ï¼?"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "é??ç½® Tor ç½?æ¡¥æ??æ?¬å?°ä»£ç??"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "ç¦?ç?¨æ??æ??ç½?ç»?"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr "æ¬¢è¿?ä½¿ç?¨ Tailsï¼?"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "è¯è¨?å??å?ºå??"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "é»?è®¤è®¾ç½®"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "å? å¯?ç??æ??ä¹?å?å?¨(_P)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "è¯·è¾?å?¥æ?¨ç??å¯?ç ?ä»¥è§£é??æ??ä¹?å?å?¨"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "é??æ?°é??å®?æ??ä¹?å?å?¨"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+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:509
+msgid "_Additional Settings"
+msgstr "é??å? è®¾ç½®(_A)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "æ·»å? ä¸?ä¸ªé¢?å¤?è®¾ç½®"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "æ??ä»¶å®¹å?¨"
diff --git a/zh_HK.po b/zh_HK.po
index ca04c280e..e52fb01de 100644
--- a/zh_HK.po
+++ b/zh_HK.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/otf/torproject/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -100,80 +100,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -181,7 +183,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -189,7 +191,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -197,225 +199,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -714,6 +528,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -810,35 +629,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -847,14 +666,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -863,42 +682,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1096,6 +915,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/zh_TW.po b/zh_TW.po
index 936f1e795..b17ca5220 100644
--- a/zh_TW.po
+++ b/zh_TW.po
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
 "Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -108,80 +108,82 @@ msgstr ""
 msgid "_Exit"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
 msgstr ""
 
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
 #, python-brace-format
 msgid ""
 "cryptsetup failed with return code {returncode}:\n"
@@ -189,7 +191,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
 #, python-brace-format
 msgid ""
 "live-persist failed with return code {returncode}:\n"
@@ -197,7 +199,7 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
 #, python-brace-format
 msgid ""
 "umount failed with return code {returncode}:\n"
@@ -205,225 +207,37 @@ msgid ""
 "{stderr}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-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/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../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/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
 msgid "_Keyboard Layout"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
 msgid "_Formats"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure 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/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-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/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -722,6 +536,11 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr ""
@@ -818,35 +637,35 @@ msgstr ""
 
 #. Translators: Don't translate {volume_label} or {volume_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
 #, python-brace-format
 msgid "{volume_label} ({volume_size})"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} or {partition_size},
 #. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
 #, python-brace-format
 msgid "{partition_name} ({partition_size})"
 msgstr ""
 
 #. Translators: Don't translate {volume_size}, it's a placeholder
 #. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
 #, python-brace-format
 msgid "{volume_size} Volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name}, it's a placeholder and
 #. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
 #, python-brace-format
 msgid "{volume_name} (Read-Only)"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {container_path}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
 #, python-brace-format
 msgid "{partition_name} in {container_path}"
 msgstr ""
@@ -855,14 +674,14 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
 #, python-brace-format
 msgid "{volume_name} â?? {path_to_file_container}"
 msgstr ""
 
 #. Translators: Don't translate {partition_name} and {drive_name}, they
 #. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
 #, python-brace-format
 msgid "{partition_name} on {drive_name}"
 msgstr ""
@@ -871,42 +690,42 @@ msgstr ""
 #. they are placeholders and will be replaced. You should only have to
 #. translate
 #. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
 #, python-brace-format
 msgid "{volume_name} â?? {drive_name}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
 msgid "Wrong passphrase or parameters"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
 msgid "Error unlocking volume"
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
 #, python-brace-format
 msgid ""
 "Couldn't unlock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
 msgid "One or more applications are keeping the volume busy."
 msgstr ""
 
 #. Translators: Don't translate {volume_name} or {error_message},
 #. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
 #, python-brace-format
 msgid ""
 "Couldn't lock volume {volume_name}:\n"
 "{error_message}"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
 msgid "Locking the volume failed"
 msgstr ""
 
@@ -1104,6 +923,130 @@ msgid ""
 " ($(command_line))"
 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:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+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:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+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:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+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
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure 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:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+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/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/tor-launcher-network-settings] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
Next by Author: [tor-commits] [translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
Previous by thread: [tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
Next by thread: [tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
Index(es):
- Author
- Thread