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

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

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

    https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
---
 ach.po    | 463 ++++++++++++++++++++++++++--------------------------------
 af.po     | 465 ++++++++++++++++++++++++++---------------------------------
 ar.po     | 485 +++++++++++++++++++++++++++----------------------------------
 ast.po    | 469 ++++++++++++++++++++++++++---------------------------------
 az.po     | 473 +++++++++++++++++++++++++++---------------------------------
 be.po     | 469 ++++++++++++++++++++++++++---------------------------------
 bg.po     | 485 +++++++++++++++++++++++++++----------------------------------
 bn.po     | 485 +++++++++++++++++++++++++++----------------------------------
 br.po     | 469 ++++++++++++++++++++++++++---------------------------------
 bs.po     | 473 +++++++++++++++++++++++++++---------------------------------
 ca.po     | 485 +++++++++++++++++++++++++++----------------------------------
 cs.po     | 485 +++++++++++++++++++++++++++----------------------------------
 cy.po     | 469 ++++++++++++++++++++++++++---------------------------------
 da.po     | 485 +++++++++++++++++++++++++++----------------------------------
 de.po     | 485 +++++++++++++++++++++++++++----------------------------------
 el.po     | 485 +++++++++++++++++++++++++++----------------------------------
 en_GB.po  | 485 +++++++++++++++++++++++++++----------------------------------
 eo.po     | 469 ++++++++++++++++++++++++++---------------------------------
 es.po     | 487 +++++++++++++++++++++++++++-----------------------------------
 es_AR.po  | 485 +++++++++++++++++++++++++++----------------------------------
 es_MX.po  | 485 +++++++++++++++++++++++++++----------------------------------
 et.po     | 473 +++++++++++++++++++++++++++---------------------------------
 eu.po     | 481 +++++++++++++++++++++++++++----------------------------------
 fa.po     | 485 +++++++++++++++++++++++++++----------------------------------
 fi.po     | 483 +++++++++++++++++++++++++++----------------------------------
 fr.po     | 485 +++++++++++++++++++++++++++----------------------------------
 fy.po     | 465 ++++++++++++++++++++++++++---------------------------------
 ga.po     | 485 +++++++++++++++++++++++++++----------------------------------
 gd.po     | 463 ++++++++++++++++++++++++++--------------------------------
 gl.po     | 479 +++++++++++++++++++++++++++---------------------------------
 gu.po     | 481 +++++++++++++++++++++++++++----------------------------------
 he.po     | 485 +++++++++++++++++++++++++++----------------------------------
 hi.po     | 483 +++++++++++++++++++++++++++----------------------------------
 hr.po     | 485 +++++++++++++++++++++++++++----------------------------------
 hu.po     | 485 +++++++++++++++++++++++++++----------------------------------
 hy.po     | 469 ++++++++++++++++++++++++++---------------------------------
 id.po     | 485 +++++++++++++++++++++++++++----------------------------------
 is.po     | 485 +++++++++++++++++++++++++++----------------------------------
 it.po     | 485 +++++++++++++++++++++++++++----------------------------------
 ja.po     | 485 +++++++++++++++++++++++++++----------------------------------
 ka.po     | 485 +++++++++++++++++++++++++++----------------------------------
 kab.po    | 463 ++++++++++++++++++++++++++--------------------------------
 kk.po     | 467 ++++++++++++++++++++++++++---------------------------------
 km.po     | 473 +++++++++++++++++++++++++++---------------------------------
 kn.po     | 465 ++++++++++++++++++++++++++---------------------------------
 ko.po     | 485 +++++++++++++++++++++++++++----------------------------------
 lt.po     | 487 +++++++++++++++++++++++++++-----------------------------------
 lv.po     | 485 +++++++++++++++++++++++++++----------------------------------
 mk.po     | 485 +++++++++++++++++++++++++++----------------------------------
 ml.po     | 469 ++++++++++++++++++++++++++---------------------------------
 mr.po     | 467 ++++++++++++++++++++++++++---------------------------------
 ms_MY.po  | 485 +++++++++++++++++++++++++++----------------------------------
 my.po     | 473 +++++++++++++++++++++++++++---------------------------------
 nb.po     | 485 +++++++++++++++++++++++++++----------------------------------
 ne.po     | 465 ++++++++++++++++++++++++++---------------------------------
 nl.po     | 487 +++++++++++++++++++++++++++-----------------------------------
 nl_BE.po  | 481 +++++++++++++++++++++++++++----------------------------------
 nn.po     | 481 +++++++++++++++++++++++++++----------------------------------
 oc.po     | 473 +++++++++++++++++++++++++++---------------------------------
 or.po     | 465 ++++++++++++++++++++++++++---------------------------------
 pa.po     | 467 ++++++++++++++++++++++++++---------------------------------
 pl.po     | 485 +++++++++++++++++++++++++++----------------------------------
 pt_BR.po  | 485 +++++++++++++++++++++++++++----------------------------------
 pt_PT.po  | 485 +++++++++++++++++++++++++++----------------------------------
 ro.po     | 485 +++++++++++++++++++++++++++----------------------------------
 ru.po     | 485 +++++++++++++++++++++++++++----------------------------------
 si_LK.po  | 473 +++++++++++++++++++++++++++---------------------------------
 sk.po     | 485 +++++++++++++++++++++++++++----------------------------------
 sl.po     | 473 +++++++++++++++++++++++++++---------------------------------
 son.po    | 465 ++++++++++++++++++++++++++---------------------------------
 sq.po     | 479 +++++++++++++++++++++++++++---------------------------------
 sr.po     | 483 +++++++++++++++++++++++++++----------------------------------
 sv.po     | 485 +++++++++++++++++++++++++++----------------------------------
 sw.po     | 469 ++++++++++++++++++++++++++---------------------------------
 ta.po     | 469 ++++++++++++++++++++++++++---------------------------------
 tails.pot | 485 +++++++++++++++++++++++++++----------------------------------
 te.po     | 467 ++++++++++++++++++++++++++---------------------------------
 th.po     | 481 +++++++++++++++++++++++++++----------------------------------
 tr.po     | 485 +++++++++++++++++++++++++++----------------------------------
 uk.po     | 485 +++++++++++++++++++++++++++----------------------------------
 ur.po     | 473 +++++++++++++++++++++++++++---------------------------------
 uz.po     | 467 ++++++++++++++++++++++++++---------------------------------
 vi.po     | 485 +++++++++++++++++++++++++++----------------------------------
 zh_CN.po  | 485 +++++++++++++++++++++++++++----------------------------------
 zh_HK.po  | 473 +++++++++++++++++++++++++++---------------------------------
 zh_TW.po  | 485 +++++++++++++++++++++++++++----------------------------------
 86 files changed, 18118 insertions(+), 23020 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 143a098b4..1d66bfaf9 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 "Kanselleer"
+
+#: 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 "Kanselleer"
+#: 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/ui/additional_settings.py:274
+msgid "Off"
 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:276
+msgid "Off (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: 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"
@@ -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 58823990a..e7fed089b 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)"
-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 "Ù?Ù?Ù?Ø© Ø§Ù?Ø³Ø± Ù?Ù?Ø£Ø¯Ù?Ù?"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "Ø®Ø¯Ø¹Ø© Ø¹Ù?Ù?Ø§Ù? MAC"
+
+#: 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 "Ø§Ù?Ø¬Ø³Ø± Ù? Ù?Ù?Ù?Ù? Ø§Ù?Ø¨Ø±Ù?Ù?Ø³Ù?"
+
+#: 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 "Ø§Ø¨Ø¯Ø£ ØªÙ?Ù?Ø²"
 
-#. 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 "Ø§Ù?Ø§Ù?ØªØ±Ø§Ø¶Ù?: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 Ø¨Ø±Ù?Ø² Ø§Ù?Ø¹Ù?Ø¯Ø© {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 "Ù?Ø´Ù? cryptsetup Ø¨Ø±Ù?Ø² Ø§Ù?Ø¹Ù?Ø¯Ø© {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 "Ù?Ø´Ù? live-persist Ø¨Ø±Ù?Ø² Ø§Ù?Ø¹Ù?Ø¯Ø© {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 "ØªØ®Ù?Ù? Ù?Ù?Ø¸Ø§Ù? ØªØ´ØºÙ?Ù? Ù?Ù?Ù?Ø¯Ù?Ø²"
-
-#. 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 "Ù?Ø°Ù? Ø§Ù?Ø®Ø§ØµÙ?Ø© Ø³ØªØ¬Ø¹Ù? Ù?Ø¸Ù?Ø± ØªÙ?Ù?Ø² Ù?Ø¨Ø¯Ù? Ù?Ø«Ù? Ù?Ø¸Ø§Ù?  Ù?Ø§Ù?Ù?Ø±Ù?Ø³Ù?Ù?Øª Ù?Ù?Ù?Ø¯Ù?Ø² 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 Ø§Ù?Ø±Ù?Ù? Ø§Ù?ØªØ³Ù?Ø³Ù?Ù? Ù?Ù?Ø§Ø¬Ù?Ø© Ø´Ø¨Ù?ØªÙ? ( Ù?Ø§Ø³Ù?Ù?Ù?Ø© Ø£Ù? Ø³Ù?Ù?Ù?Ø© ) Ø¹Ù? Ø§Ù?Ø´Ø¨Ù?Ø© Ø§Ù?Ù?ØÙ?Ù?Ø© . ØªØºÙ?Ù?Ø± Ø¹Ù?Ø§Ù?Ù?Ù? 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 "Ù?Ø±ØØ¨Ø§ Ø¨Ù? Ø¥Ù?Ù? ØªØ§Ù?Ù?Ø² !"
-
-#. 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 "Ù?Ù? Ù?ØªÙ? Ø¥Ø±Ø´Ø§Ø¯Ù? Ø®Ù?Ø§Ù? Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª ØªÙ?Ù?Ø² Ø? Ø§Ø¶ØºØ· Ø¹Ù?Ù? <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 "_Ø§Ù?Ù?ØºØ©"
 
-#: 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 "Ø¥Ø°Ø§ Ù?Ø§Ù? Ø§Ù?Ø§ØªØµØ§Ù? Ø¨Ø§Ù?Ø´Ø¨Ù?Ø© Ù?Ø±Ø§Ù?Ø¨ Ø? Ù?ØµÙ?Ù? Ø? Ø£Ù? ØªØØª Ø§Ù?Ø¨Ø±Ù?Ù?Ø³Ù? Ø§Ø¶Ø¨Ø· Ø¬Ø³Ø± Tor Ø£Ù? Ù?Ù?Ù?Ù? Ù?ØÙ?Ù? . Ù?Ù?Ù?Ù?Ù? ØªØ¹Ø·Ù?Ù? Ø¬Ù?Ù?Ø¹ Ø§Ù?Ø§ØªØµØ§Ù?Ø§Øª Ù?Ù?Ø´Ø¨Ù?Ø© Ù?Ù?Ø¹Ù?Ù? Ø¨Ø®Ù?Ø§Ø¡ ."
-
-#: 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 "Ø®Ø¯Ø¹Ø© Ø¹Ù?Ù?Ø§Ù? 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 "Ù?Ø´ØºÙ? (Ø¥Ù?ØªØ±Ø§Ø¶Ù?)"
-
-#: 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 "ØªÙ?Ù?Ù?Ù? _Windows"
-
-#: 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 "{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 "{partition_name} Ù?Ù? {container_path}"
@@ -866,14 +685,14 @@ msgstr "{partition_name} Ù?Ù? {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} Ø¹Ù?Ù? {drive_name}"
@@ -882,42 +701,42 @@ msgstr "{partition_name} Ø¹Ù?Ù? {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 "Ø®Ø·Ø£ Ù?Ù? Ù?Ù?Ù?Ø© Ø§Ù?Ù?Ø±Ù?Ø± Ø§Ù? Ø§Ù?Ø¹Ù?Ø§Ù?Ù?"
 
-#: 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 "Ø§Ù?ØªÙ?Ø«Ù?Ù? Ù?Ø·Ù?Ù?Ø¨ Ù?Ø§Ø²Ø§Ù?Ø© ØØ²Ù?Ø© Ù?Ù? Ø¨Ø±Ø§Ù?Ø¬Ù? Ø§Ù?Ø§Ø¶Ø§Ù?Ù?Ø© ($(Ø³Ø·Ø±_Ø§Ù?Ø£Ù?Ø§Ù?Ø±))"
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../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 Ø§Ù?Ø±Ù?Ù? Ø§Ù?ØªØ³Ù?Ø³Ù?Ù? Ù?Ù?Ø§Ø¬Ù?Ø© Ø´Ø¨Ù?ØªÙ? ( Ù?Ø§Ø³Ù?Ù?Ù?Ø© Ø£Ù? Ø³Ù?Ù?Ù?Ø© ) Ø¹Ù? Ø§Ù?Ø´Ø¨Ù?Ø© Ø§Ù?Ù?ØÙ?Ù?Ø© . ØªØºÙ?Ù?Ø± Ø¹Ù?Ø§Ù?Ù?Ù? 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 "Ø§Ù?Ø¥ØªØµØ§Ù? Ø§Ù?Ù?Ø¨Ø§Ø´Ø± Ø¨Ø´Ø¨Ù?Ø© ØªÙ?Ø± (Ø¥Ù?ØªØ±Ø§Ø¶Ù?)"
+
+#: ../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 "Ø³ØªÙ?Ù?Ù? Ø¨ØªØ¹Ù?Ù?Ù? Ø¬Ø³Ù?Ø± Tor Ù?Ø§Ù?Ù?Ù?Ù?Ù? Ø§Ù?Ù?ØÙ?Ù? Ù?Ø§ØÙ?Ø§Ù? Ø¨Ø¹Ø¯ Ø§Ù?Ø§ØªØµØ§Ù? Ø¨Ø§Ù?Ø´Ø¨Ù?Ø© ."
+
+#: ../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 67bc2710e..80704958e 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 "Cancel"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
+msgstr "Amestar"
+
+#: 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:398
-msgid "Offline"
-msgstr "Sin conexÃ³n"
+#: 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: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:156
+msgid "_MAC Address Spoofing"
 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:206
+msgid "_Network Connection"
 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:215
+msgid "Direct (default)"
 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:217
+msgid "Bridge & Proxy"
 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:219
+msgid "Offline"
+msgstr "Sin conexÃ³n"
+
+#: 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: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"
+#: 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:609
-msgid "Add"
-msgstr "Amestar"
+#: 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:617
-msgid "Back"
+#: 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/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: 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"
@@ -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 "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 ""
+
 #: 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 9e57f2f71..4f8eb8615 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 "_BaÅ?lat"
 msgid "_Exit"
 msgstr "_Ã?Ä±xÄ±Å?"
 
-#: 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"
-msgstr ""
+#: 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 "LÉ?Ä?v et"
 
-#: 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:46
+msgid "Add"
+msgstr "Æ?lavÉ? et"
 
-#: 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 "Geri"
+
+#: 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 "LÉ?Ä?v et"
+#: 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"
-msgstr "Æ?lavÉ? et"
+#: 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"
-msgstr "Geri"
+#: 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/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "SÃ¶ndÃ¼r"
 
-#: 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"
@@ -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 "TÉ?sdiqlÉ?"
-
-#: 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 "SÃ¶ndÃ¼r"
-
-#. 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 "BÃ¼tÃ¼n Å?É?bÉ?kÉ?ni sÃ¶ndÃ¼r"
-
-#: 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 "Parol"
 
+#: 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 "TÉ?sdiqlÉ?"
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr "Tails-in bu versiyasÄ±nÄ±n bilinÉ?n tÉ?hlÃ¼kÉ?sizlik problemlÉ?ri var:"
@@ -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 "SÃ¶ndÃ¼r"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in: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 "BÃ¼tÃ¼n Å?É?bÉ?kÉ?ni sÃ¶ndÃ¼r"
+
+#: ../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 0b641f5cb..5ea0f86d8 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 "Cancel"
+
+#: 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/ui/add_settings_dialog.py:54
+msgid "Back"
+msgstr "Ð?Ð°Ð·Ð°Ð´"
+
+#: 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:398
-msgid "Offline"
+#: 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: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:206
+msgid "_Network Connection"
 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:215
+msgid "Direct (default)"
 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:217
+msgid "Bridge & Proxy"
 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:219
+msgid "Offline"
 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:270
+msgid "On (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"
-msgstr "Cancel"
+#: 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:609
-msgid "Add"
-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/gui.py:617
-msgid "Back"
-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/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: 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"
@@ -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 9377d163d..310f3f637 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)"
-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 "_Ð?Ð´Ð¼Ð¸Ð½Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¾Ñ?Ñ?ÐºÐ° Ð¿Ð°Ñ?Ð¾Ð»Ð°"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "Ð¤Ð°Ð»Ñ?Ð¸Ñ?Ð¸Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ð½Ð° _MAC Ð°Ð´Ñ?ÐµÑ?"
+
+#: 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 "Ð?Ð¾Ñ?Ñ? & Ð¿Ñ?Ð¾ÐºÑ?Ð¸"
+
+#: 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"
 
-#. 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 "live-persist Ð²Ñ?Ñ?Ð½Ð° Ð³Ñ?ÐµÑ?ÐºÐ° Ñ? ÐºÐ¾Ð´ {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"
@@ -188,7 +190,7 @@ msgid ""
 "{stderr}"
 msgstr "cryptsetup Ð²Ñ?Ñ?Ð½Ð° Ð³Ñ?ÐµÑ?ÐºÐ° Ñ? ÐºÐ¾Ð´ {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"
@@ -196,7 +198,7 @@ msgid ""
 "{stderr}"
 msgstr "live-persist Ð²Ñ?Ñ?Ð½Ð° Ð³Ñ?ÐµÑ?ÐºÐ° Ñ? ÐºÐ¾Ð´ {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"
@@ -204,225 +206,37 @@ msgid ""
 "{stderr}"
 msgstr "umount Ð²Ñ?Ñ?Ð½Ð° Ð³Ñ?ÐµÑ?ÐºÐ° Ñ? ÐºÐ¾Ð´ {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 Ð°Ð´Ñ?ÐµÑ?a Ñ?ÐºÑ?Ð¸Ð²Ð° Ñ?ÐµÑ?Ð¸Ð¹Ð½iÑ? Ð½Ð¾Ð¼ÐµÑ? Ð½Ð° Ð²Ð°Ñ?Ð°Ñ?Ð° Ð¼Ñ?ÐµÐ¶Ð¾Ð²Ð° ÐºÐ°Ñ?Ñ?Ð°(WiFi Ð¸Ð»Ð¸ ÐºÐ°Ð±ÐµÐ») Ð² Ð»Ð¾ÐºÐ°Ð»Ð½Ð°Ñ?Ð° Ð¼Ñ?ÐµÐ¶Ð°. Ð¢Ð¾Ð²Ð° Ð·Ð°Ñ?Ð¸Ð»Ð²Ð° Ñ?Ð¸Ð³Ñ?Ñ?Ð½Ð¾Ñ?Ñ?Ñ?Ð°, Ð·Ð°Ñ?Ð¾Ñ?Ð¾ Ð¿Ð¾Ð´Ð¿Ð¾Ð¼Ð°Ð³Ð° Ð¿Ñ?Ð¸ÐºÑ?Ð¸Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð³ÐµÐ¾Ð³Ñ?Ð°Ñ?Ñ?ÐºÐ¾Ñ?Ð¾ Ð?Ð¸ Ð¼ÐµÑ?Ñ?Ð¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ."
-
-#: 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 "_Ð?Ð·Ð¸Ðº"
 
-#: 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 "Ð?Ð°Ñ?ÐµÑ?Ð¾ Ð´Ð¸Ñ?ÐºÐ¾Ð²Ð¾ Ð¿Ñ?Ð¾Ñ?Ñ?Ñ?Ð°Ð½Ñ?Ñ?Ð²Ð¾ Ðµ Ð¾Ñ?ÐºÐ»Ñ?Ñ?ÐµÐ½Ð¾. Ð ÐµÑ?Ñ?Ð°Ñ?Ñ?Ð¸Ñ?Ð°Ð¹Ñ?Ðµ Tails,  Ð·Ð° Ð´Ð° Ð³Ð¾ Ð·Ð°ÐºÐ»Ñ?Ñ?Ð¸Ñ?Ðµ Ð¾Ñ?Ð½Ð¾Ð²Ð¾."
-
-#: 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 "Ð?ÐºÐ¾ Ð¸Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ð²Ñ?Ñ?Ð·ÐºÐ°Ñ?Ð° Ðµ Ñ?ÐµÐ½Ð·Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ð°, Ñ?Ð¸Ð»Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ð°, Ð¸Ð»Ð¸ Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð° Ð¿Ñ?Ð¾ÐºÑ?Ð¸ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¸Ñ?Ðµ 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 "_Ð?Ð´Ð¼Ð¸Ð½Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¾Ñ?Ñ?ÐºÐ° Ð¿Ð°Ñ?Ð¾Ð»Ð°"
-
-#: 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 Ð°Ð´Ñ?ÐµÑ?"
-
-#: 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 "Ð¢Ð°Ð·Ð¸ Ð²ÐµÑ?Ñ?Ð¸Ñ? Ð½Ð° Tails Ðµ Ð¸Ð·Ð²ÐµÑ?Ñ?Ð½Ð° Ñ? Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ð¸Ñ?Ðµ Ñ?Ñ?Ñ? Ñ?Ð¸Ð³Ñ?Ñ?Ð½Ð¾Ñ?Ñ?Ñ?Ð°:"
@@ -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 "Ð?Ð¾Ð´Ð¿Ñ?Ð°Ð²Ñ?Ð½Ðµ Ð½Ð° 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 Ð°Ð´Ñ?ÐµÑ?a Ñ?ÐºÑ?Ð¸Ð²Ð° Ñ?ÐµÑ?Ð¸Ð¹Ð½iÑ? Ð½Ð¾Ð¼ÐµÑ? Ð½Ð° Ð²Ð°Ñ?Ð°Ñ?Ð° Ð¼Ñ?ÐµÐ¶Ð¾Ð²Ð° ÐºÐ°Ñ?Ñ?Ð°(WiFi Ð¸Ð»Ð¸ ÐºÐ°Ð±ÐµÐ») Ð² Ð»Ð¾ÐºÐ°Ð»Ð½Ð°Ñ?Ð° Ð¼Ñ?ÐµÐ¶Ð°. Ð¢Ð¾Ð²Ð° Ð·Ð°Ñ?Ð¸Ð»Ð²Ð° Ñ?Ð¸Ð³Ñ?Ñ?Ð½Ð¾Ñ?Ñ?Ñ?Ð°, Ð·Ð°Ñ?Ð¾Ñ?Ð¾ Ð¿Ð¾Ð´Ð¿Ð¾Ð¼Ð°Ð³Ð° Ð¿Ñ?Ð¸ÐºÑ?Ð¸Ð²Ð°Ð½ÐµÑ?Ð¾ Ð½Ð° Ð³ÐµÐ¾Ð³Ñ?Ð°Ñ?Ñ?ÐºÐ¾Ñ?Ð¾ Ð?Ð¸ Ð¼ÐµÑ?Ñ?Ð¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ."
+
+#: ../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 "Ð?Ñ?Ð¸Ð¿Ñ?Ð¸Ñ?Ð°Ð½Ð¾ _Ð¿Ñ?Ð¾Ñ?Ñ?Ñ?Ð°Ð½Ñ?Ñ?Ð²Ð¾"
+
+#: ../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 "_Ð?Ð¾Ð¿Ñ?Ð»Ð½Ð¸Ñ?ÐµÐ»Ð½Ð¸ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸"
+
+#: ../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 fab1111b9..aa4034842 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 "_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)"
-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 "_Administration Password"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_MAC Address Spoofing"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_Network Connection"
+
+#: 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 "_Start 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 "à¦°à¦¿à¦à¦¿à¦? à¦?à§?à¦¡ {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"
@@ -179,7 +181,7 @@ msgid ""
 "{stderr}"
 msgstr "cryptsetup à¦°à¦¿à¦?à¦¾à¦°à§?à¦¨ à¦?à§?à¦¡ {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"
@@ -187,7 +189,7 @@ msgid ""
 "{stderr}"
 msgstr "à¦°à¦¿à¦à¦¿à¦? à¦?à§?à¦¡ {returncode} à¦¦à¦¿à¦¯à¦¼à§? à¦²à¦¾à¦?à¦-à¦?à¦²à¦¤à§? à¦¬à§?à¦¯à¦°à§?à¦¥ à¦¹à¦¯à¦¼à§?à¦?à§?:\n\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"
@@ -195,225 +197,37 @@ msgid ""
 "{stderr}"
 msgstr "umount à¦«à§?à¦°à¦¤ à¦?à§?à¦¡ {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 "à¦?à¦?à¦¨à§?à¦¡à§?à¦? à¦?à¦¦à§?à¦®à¦¬à§?à¦¶"
-
-#. 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 "à¦?à¦? à¦¬à¦¿à¦?à¦²à§?à¦ªà¦?à¦¿ à¦?à¦¾à¦?à¦²à¦?à§?à¦²à¦¿ à¦®à¦¾à¦?à¦?à§?à¦°à§?à¦¸à¦«à¦? à¦?à¦?à¦¨à§?à¦¡à§?à¦? 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 "à¦®à¦¾à¦?à¦?à§?à¦°à§?à¦¸à¦«à¦? à¦?à¦?à¦¨à§?à¦¡à§?à¦? 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 "à¦®à§?à¦¯à¦¾à¦? à¦ à¦¿à¦?à¦¾à¦¨à¦¾ à¦¸à§?à¦ªà§?à¦«à¦¿à¦?"
-
-#: 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 à¦?à§?à¦¯à¦¾à¦¡à§?à¦°à§?à¦¸à¦?à§?à¦²à¦¿ à¦¸à¦¾à¦§à¦¾à¦°à¦£à¦¤ à¦¨à¦¿à¦°à¦¾à¦ªà¦¦ à¦¹à¦¯à¦¼ à¦?à¦¾à¦°à¦£ à¦?à¦?à¦¿ à¦?à¦ªà¦¨à¦¾à¦?à§? à¦?à¦ªà¦¨à¦¾à¦° à¦à§?à¦?à§?à¦²à¦¿à¦? à¦?à¦¬à¦¸à§?à¦¥à¦¾à¦¨à¦?à§? à¦²à§?à¦?à¦¾à¦¤à§? à¦¸à¦¾à¦¹à¦¾à¦¯à§?à¦¯ à¦?à¦°à§?à¥¤ à¦?à¦¿à¦¨à§?à¦¤à§? à¦?à¦?à¦¿ à¦¸à¦?à¦¯à§?à¦? à¦¸à¦®à¦¸à§?à¦¯à¦¾ à¦¤à§?à¦°à¦¿ à¦?à¦°à¦¤à§? à¦ªà¦¾à¦°à§? à¦¬à¦¾ à¦¸à¦¨à§?à¦¦à§?à¦¹à¦?à¦¨à¦? à¦¦à§?à¦?à¦¾à¦¯à¦¼"
-
-#: 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 "à¦?à¦®à¦?à¦?à¦¸à¦¿ à¦?à§?à¦¯à¦¾à¦¡à§?à¦°à§?à¦¸ à¦¸à§?à¦ªà§?à¦« à¦?à¦°à¦¬à§?à¦¨ à¦¨à¦¾"
-
-#: 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 "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 "_Language"
 
-#: 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 "_Keyboard Layout"
 
-#: 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 "_Time Zone"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "à¦?à¦¨à¦?à§?à¦°à¦¿à¦ªà§?à¦? à¦?à¦°à¦¾ _Persistent Storage"
-
-#: 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 "Relock à¦¦à§?à¦¢à¦¼ à¦¸à¦?à¦?à§?à¦°à¦¹à¦¸à§?à¦¥à¦²"
-
-#: 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 "_Additional Settings"
-
-#: 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 "_Administration Password"
-
-#: 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 Address Spoofing"
-
-#: 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 "_Network Connection"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Windows Camouflage"
-
-#: 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 "Tails à¦?à¦° à¦?à¦? à¦¸à¦?à¦¸à§?à¦?à¦°à¦£ à¦¨à¦¿à¦°à¦¾à¦ªà¦¤à§?à¦¤à¦¾ à¦¬à¦¿à¦·à¦¯à¦¼ à¦ªà¦°à¦¿à¦?à¦¿à¦¤ à¦¹à¦¯à¦¼à§?à¦?à§?:"
@@ -808,35 +627,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} (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} à¦¹à¦¯à¦¼ {container_path}"
@@ -845,14 +664,14 @@ msgstr "{partition_name} à¦¹à¦¯à¦¼ {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} on {drive_name}"
@@ -861,42 +680,42 @@ msgstr "{partition_name} on {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 "à¦à§?à¦² à¦ªà¦¾à¦¸à¦«à§?à¦°à§?à¦? à¦¬à¦¾ à¦ªà¦°à¦¾à¦®à¦¿à¦¤à¦¿"
 
-#: 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 ""
 
-#: 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 "à¦?à¦ªà¦¨à¦¾à¦° à¦?à¦¤à¦¿à¦°à¦¿à¦?à§?à¦¤ à¦¸à¦«à§?à¦?à¦?à¦¯à¦¼à§?à¦¯à¦¾à¦° à¦¥à§?à¦?à§? à¦?à¦?à¦?à¦¿ à¦ªà§?à¦¯à¦¾à¦?à§?à¦? à¦?à¦ªà¦¸à¦¾à¦°à¦£ à¦?à¦°à¦¤à§? à¦ªà§?à¦°à¦¤à§?à¦¯à¦¯à¦¼à¦¨ à¦?à¦¬à¦¶à§?à¦¯à¦? ($(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 "à¦®à§?à¦¯à¦¾à¦? à¦?à§?à¦¯à¦¾à¦¡à§?à¦°à§?à¦¸ à¦¸à§?à¦ªà§?à¦«à¦¿à¦? à¦?à¦ªà¦¨à¦¾à¦° à¦¨à§?à¦?à¦?à¦¯à¦¼à¦¾à¦°à§?à¦?à§?à¦° à¦?à¦¨à§?à¦?à¦¾à¦°à¦«à§?à¦¸à§?à¦° à¦¸à¦¿à¦°à¦¿à¦¯à¦¼à¦¾à¦² à¦¨à¦®à§?à¦¬à¦° (à¦?à¦¯à¦¼à¦¾à¦?-à¦«à¦¾à¦? à¦¬à¦¾ à¦?à¦¯à¦¼à§?à¦¯à¦¾à¦°à§?à¦¡) à¦¸à§?à¦¥à¦¾à¦¨à§?à¦¯à¦¼ à¦¨à§?à¦?à¦?à¦¯à¦¼à¦¾à¦°à§?à¦?à¦?à§? à¦²à§?à¦?à¦¿à¦¯à¦¼à§? à¦°à¦¾à¦?à§?à¥¤ à¦¸à§?à¦ªà§?à¦?à¦¿à¦? 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 "à¦?à¦®à¦?à¦?à¦¸à¦¿ à¦?à§?à¦¯à¦¾à¦¡à§?à¦°à§?à¦¸ à¦¸à§?à¦ªà§?à¦« à¦?à¦°à¦¬à§?à¦¨ à¦¨à¦¾"
+
+#: ../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 "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 "à¦?à¦¨à¦?à§?à¦°à¦¿à¦ªà§?à¦? à¦?à¦°à¦¾ _Persistent Storage"
+
+#: ../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 "Relock à¦¦à§?à¦¢à¦¼ à¦¸à¦?à¦?à§?à¦°à¦¹à¦¸à§?à¦¥à¦²"
+
+#: ../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 "_Additional Settings"
+
+#: ../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 6aabdcba1..6a141729b 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 "Cancel"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
+msgstr "OuzhpennaÃ±"
+
+#: 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:398
-msgid "Offline"
-msgstr "Ezlinenn"
+#: 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: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:156
+msgid "_MAC Address Spoofing"
 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:206
+msgid "_Network Connection"
 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:215
+msgid "Direct (default)"
 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:217
+msgid "Bridge & Proxy"
 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:219
+msgid "Offline"
+msgstr "Ezlinenn"
+
+#: 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: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"
+#: 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:609
-msgid "Add"
-msgstr "OuzhpennaÃ±"
+#: 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:617
-msgid "Back"
+#: 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/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: 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"
@@ -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 "Ger-tremen"
 
+#: 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 69823fdb4..8447d5f89 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"
-msgstr ""
+#: 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 "OtkaÅ¾i"
 
-#: 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:46
+msgid "Add"
+msgstr "Dodaj"
 
-#: 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 "Nazad"
+
+#: 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 "OtkaÅ¾i"
+#: 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"
-msgstr "Dodaj"
+#: 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"
-msgstr "Nazad"
+#: 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/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: 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"
@@ -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 "potvrditi"
-
-#: 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 "Lozinka"
 
+#: 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 "potvrditi"
+
 #: 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 4c471f194..4c718b177 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)"
-msgstr "Directe (defecte)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Pont i servidor intermedi"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Fora de lÃnia"
-
-#: 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 "Desbloquejar"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Error al blocar l'emmagatzemament persistent."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
-msgstr "Desbloquejar"
-
-#: 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 es pot desbloquejar la memÃ²ria encriptada amb la contrasenya."
-
-#: 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 "ParÃ metres adicionals"
 
-#: 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 "CancelÂ·la"
 
-#: 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 "Afegeix"
 
-#: 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 "Enrere"
 
-#: 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 "_Contrasenya d'administrador"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_AdreÃ§a MAC simulada"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_ConnexiÃ³ de xarxa"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Directe (defecte)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Pont i servidor intermedi"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Fora de lÃnia"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "ActivaciÃ³ (defecte)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Activat"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Desactivar"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "DesactivaciÃ³ (defecte)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "Tancar"
 
-#: 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 "per defecte: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 ha fallat amb el segÃ¼ent codi {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"
@@ -193,7 +195,7 @@ msgid ""
 "{stderr}"
 msgstr "cryptsetup amb el segÃ¼ent codi {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"
@@ -201,7 +203,7 @@ msgid ""
 "{stderr}"
 msgstr "ive-persist ha fallat amb el segÃ¼ent codi {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"
@@ -209,225 +211,37 @@ msgid ""
 "{stderr}"
 msgstr "unmount ha fallat amb el segÃ¼ent codi {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 "Contrasenya d'administador"
-
-#: 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 "Configurar una contrasenya d'administrador, si ha de menester tasques d'administraciÃ³. D'altra manera, la contrasenya d'administrador restarÃ  deshabilitada per major seguretat."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Introduir contrasenya d'administrador"
-
-#: 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 "Confirma"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Confirmar la contrasenya d'administrador "
-
-#: 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 "Camuflatge de 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 "Aquesta opciÃ³ permet a Tails visualitzar-se com Microsoft Windows 10. Permeten no aixecar sospites en llocs pÃºblics."
-
-#. 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 "Camuflatge de 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 "Falsejament de direcciÃ³ 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 falsejament de la direcciÃ³ MAC amaga el nÃºmero de serie de xarxa (d'interfÃcies sense fils o amb fil) a la xarxa local. El falsejament de direccions MAC en general Ã©s segur al amagar la localitzaciÃ³ geogrÃ fica. PerÃ² tambÃ© crea problemes de connectivitat i sembla sospitÃ³s. "
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Falsejament de totes les direccions MAC (per defecte)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "No falsejar les direccions 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Ã  el pont i el servidor intermedi de Tor, posterior a una connexiÃ³ a la xarxa."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Benvingut 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 "Per esser guiat als parÃ metres de Tails, faci click a <b>Fer un visita guiada</b> a dalt."
+#: 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 "Desbloquejar"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Llengua i regiÃ³"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Error al blocar l'emmagatzemament persistent."
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "ConfiguraciÃ³ per defecte"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
+msgstr "Desbloquejar"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Desar parÃ metres de llengua i regiÃ³"
+#: 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 es pot desbloquejar la memÃ²ria encriptada amb la contrasenya."
 
-#: 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 "_Llengua"
 
-#: 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 "_DisposiciÃ³ del teclat"
 
-#: 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 "_Zona horÃ ria"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "_Emmagatzematge persistent encriptat"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Mostra contrasenya"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "ParÃ metres d'emmagatzematge persistent"
-
-#. 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 "Entrar contrasenya per desbloquejar l'emmagatzematge persistent"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Re-bloquejar l'emmagatzemament persistent"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "El vostre emmagatzematge persistent estÃ  desbloquejat. Reinicieu Tails per a bloquejar-lo de nou."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_ParÃ metres addicionals"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Desar parÃ metres addicionals"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Afegir parÃ metres addicionals"
-
-#: 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Ã³ de xarxa"
-
-#: 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 la connexiÃ³ a Internet Ã©s censurada, filtrada o amb servidor intermedi pot configurar un pont o servidor intermedi Tor. Per treballar fora de lÃnia, pot deshabilitar totes les xarxes."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Connectat directament a la xarxa Tor (per defecte)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Configureu un pont Tor o un proxy local"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Desactiva tota la xarxa"
-
-#: 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 "Els valors per defecte sÃ³n segurs en la majoria de situacions. Per afegir una configuraciÃ³ personalitzada, pressionar el botÃ³ \"+\"."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Contrasenya d'administrador"
-
-#: 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 "DesactivaciÃ³ (defecte)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_AdreÃ§a MAC simulada"
-
-#: 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 "ActivaciÃ³ (defecte)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_ConnexiÃ³ de xarxa"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Camuflatge de finestres"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Activat"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Desactivar"
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -726,6 +540,11 @@ msgstr "Establiu una contrasenya per a desblocar la pantalla."
 msgid "Password"
 msgstr "Contrasenya"
 
+#: 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 "Confirma"
+
 #: 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 "Obrint Circuits 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} 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} (Lectura nomÃ©s)"
 
 #. 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} al {container_path}"
@@ -859,14 +678,14 @@ msgstr "{partition_name} al {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} al {drive_name}"
@@ -875,42 +694,42 @@ msgstr "{partition_name} al {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 "Contrassenya o parÃ metres incorrectes."
 
-#: 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 desbloquejar el volum"
 
 #. 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 s'ha pogut desbloquejar el volum {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 aplicacions tenen el volum en Ãºs."
 
 #. 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 s'ha pogut blocar el volum {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 "Ha fallat en blocar el volum"
 
@@ -1108,6 +927,130 @@ msgid ""
 " ($(command_line))"
 msgstr "Es necessita l'autenticaciÃ³ per eliminar un paquet del programari addicional ($ (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 "Contrasenya d'administador"
+
+#: ../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 "Configurar una contrasenya d'administrador, si ha de menester tasques d'administraciÃ³. D'altra manera, la contrasenya d'administrador restarÃ  deshabilitada per major seguretat."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Introduir contrasenya d'administrador"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Confirmar la contrasenya d'administrador "
+
+#: ../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 "Falsejament de direcciÃ³ 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 falsejament de la direcciÃ³ MAC amaga el nÃºmero de serie de xarxa (d'interfÃcies sense fils o amb fil) a la xarxa local. El falsejament de direccions MAC en general Ã©s segur al amagar la localitzaciÃ³ geogrÃ fica. PerÃ² tambÃ© crea problemes de connectivitat i sembla sospitÃ³s. "
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Falsejament de totes les direccions MAC (per defecte)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "No falsejar les direccions MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "ConfiguraciÃ³ de xarxa"
+
+#: ../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 la connexiÃ³ a Internet Ã©s censurada, filtrada o amb servidor intermedi pot configurar un pont o servidor intermedi Tor. Per treballar fora de lÃnia, pot deshabilitar totes les xarxes."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Connectat directament a la xarxa Tor (per defecte)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Configureu un pont Tor o un proxy local"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Desactiva tota la xarxa"
+
+#: ../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Ã  el pont i el servidor intermedi de Tor, posterior a una connexiÃ³ a la xarxa."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Benvingut a Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Llengua i regiÃ³"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "ConfiguraciÃ³ per defecte"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "_Emmagatzematge persistent encriptat"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "ParÃ metres d'emmagatzematge persistent"
+
+#. The label 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 "Entrar contrasenya per desbloquejar l'emmagatzematge persistent"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Re-bloquejar l'emmagatzemament persistent"
+
+#: ../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 "El vostre emmagatzematge persistent estÃ  desbloquejat. Reinicieu Tails per a bloquejar-lo de nou."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_ParÃ metres addicionals"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Afegir parÃ metres addicionals"
+
+#: ../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 "Els valors per defecte sÃ³n segurs en la majoria de situacions. Per afegir una configuraciÃ³ personalitzada, pressionar el botÃ³ \"+\"."
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "Contenidors de fitxers"
diff --git a/cs.po b/cs.po
index 90abfad9c..c8d5aafbf 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)"
-msgstr "PÅ?Ãmo (vÃ½chozÃ)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Bridge & 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 "Odemknout"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "NepodaÅ?ilo se znovu zamknout trvalÃ© ÃºloÅ¾iÅ¡tÄ?."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
-msgstr "OdemknutÃ..."
-
-#: 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 "Nelze odemknout Å¡ifrovanÃ© ÃºloÅ¾iÅ¡tÄ? s tÃmto pÅ?ÃstupovÃ½m heslem."
-
-#: 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 "DalÅ¡Ã nastavenÃ"
 
-#: 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 "ZruÅ¡it"
 
-#: 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 "PÅ?idat"
 
-#: 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 "ZpÄ?t"
 
-#: 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 "_Heslo pro sprÃ¡vu"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_FalÅ¡ovÃ¡nÃ MAC adresy"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_SÃÅ¥ovÃ¡ pÅ?ipojenÃ"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "PÅ?Ãmo (vÃ½chozÃ)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Bridge & 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 "Zapnuto (vÃ½chozÃ)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Zapnout"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Vypnout"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Vypnuto (vÃ½chozÃ)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "Vypnout"
 
-#: 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 "_Spustit 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 "vÃ½chozÃ: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 selhal s nÃ¡vratovÃ½m kÃ³dem {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"
@@ -189,7 +191,7 @@ msgid ""
 "{stderr}"
 msgstr "cryptsetup selhal s nÃ¡vratovÃ½m kÃ³dem {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"
@@ -197,7 +199,7 @@ msgid ""
 "{stderr}"
 msgstr "live-persist selhal s nÃ¡vratovÃ½m kÃ³dem {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"
@@ -205,225 +207,37 @@ msgid ""
 "{stderr}"
 msgstr "umount selhal s nÃ¡vratovÃ½m kÃ³dem {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 "Heslo pro sprÃ¡vu"
-
-#: 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 "Pokud potÅ?ebujete provÃ¡dÄ?t Ãºkoly sprÃ¡vy, nastavte administrÃ¡torskÃ© heslo. V opaÄ?nÃ©m pÅ?ÃpadÄ? je heslo pro sprÃ¡vu zakÃ¡zÃ¡no pro lepÅ¡Ã zabezpeÄ?enÃ."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Zadejte heslo pro sprÃ¡vu"
-
-#: 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 "Potvrdit"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "PotvrÄ?te VaÅ¡e heslo pro sprÃ¡vu"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "ZakÃ¡zat"
-
-#. 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 "MaskovÃ¡nÃ 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 "Tato volba zpÅ¯sobuje, Å¾e Tails vypadajÃ jako Microsoft Windows 10. To mÅ¯Å¾e bÃ½t uÅ¾iteÄ?nÃ©, aby nedochÃ¡zelo k pÅ?ilÃ¡kÃ¡nÃ pozornosti a podezÅ?enÃ na veÅ?ejnÃ½ch mÃstech."
-
-#. 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 "MaskovÃ¡nÃ 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 "FalÅ¡ovÃ¡nÃ MAC adresy"
-
-#: 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 "FalÅ¡ovÃ¡nÃ MAC adres skryje sÃ©riovÃ© Ä?Ãslo vaÅ¡eho sÃÅ¥ovÃ©ho rozhranÃ (Wi-Fi nebo kabelovÃ©ho) v mÃstnÃ sÃti. FalÅ¡ovÃ¡nÃ MAC adres je obecnÄ? bezpeÄ?nÄ?jÅ¡Ã, protoÅ¾e vÃ¡m pomÅ¯Å¾e skrÃ½t vaÅ¡e geografickÃ© umÃstÄ?nÃ. MÅ¯Å¾e to vÅ¡ak takÃ© zpÅ¯sobit problÃ©my s pÅ?ipojenÃm nebo vypadat podezÅ?ele."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "FalÅ¡ovat vÅ¡echny MAC adresy (vÃ½chozÃ)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "NefalÅ¡ovat MAC adresy"
-
-#: 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 "Po pÅ?ipojenÃ k sÃti nakonfigurujete pÅ?emostÄ?nÃ Tor a lokÃ¡lnÃ proxy."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "VÃtejte v 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 "Pokud se chcete nechat provÃ©st pÅ?es nastavenÃ Tails, kliknÄ?te na <b>Nechat se provÃ©st</b> vÃ½Å¡e."
+#: 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 "Odemknout"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "undefined"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "NepodaÅ?ilo se znovu zamknout trvalÃ© ÃºloÅ¾iÅ¡tÄ?."
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "VÃ½chozÃ nastavenÃ"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
+msgstr "OdemknutÃ..."
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "UloÅ¾it nastavenÃ pro jazyk a region"
+#: 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 "Nelze odemknout Å¡ifrovanÃ© ÃºloÅ¾iÅ¡tÄ? s tÃmto pÅ?ÃstupovÃ½m heslem."
 
-#: 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 "_Jazyk"
 
-#: 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 "_RozloÅ¾enÃ klÃ¡ves"
 
-#: 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 "_FormÃ¡ty"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Ä?asovÃ© pÃ¡smo"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Å ifrovanÃ© _TrvalÃ© ÃºloÅ¾iÅ¡tÄ?"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Zobrazit heslo"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Konfigurace TrvalÃ©ho ÃºloÅ¾iÅ¡tÄ?"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "Pro odemknutÃ trvalÃ©ho uloÅ¾iÅ¡tÄ? zadejte heslo"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Znovu zamÄ?Ãt trvalÃ© ÃºloÅ¾iÅ¡tÄ?"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "TrvalÃ© ÃºloÅ¾iÅ¡tÄ? je odemÄ?eno. Restart Tails ho znovu uzamkne."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_DalÅ¡Ã nastavenÃ"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "UloÅ¾it DalÅ¡Ã nastavenÃ"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "PÅ?idat dalÅ¡Ã nastavenÃ"
-
-#: 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 "Konfigurace sÃtÄ?"
-
-#: 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 "Pokud je vaÅ¡e internetovÃ© pÅ?ipojenÃ cenzurovÃ¡no, filtrovÃ¡no nebo vyuÅ¾ÃvÃ¡ proxy, mÅ¯Å¾ete nakonfigurovat pÅ?emostÄ?nÃ Tor nebo mÃstnÃ proxy. Chcete-li pracovat zcela offline, mÅ¯Å¾ete zakÃ¡zat vÅ¡echna sÃÅ¥ovÃ¡ pÅ?ipojenÃ."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "PÅ?ipojit se pÅ?Ãmo k sÃti Tor (vÃ½chozÃ)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Konfigurace pÅ?emostÄ?nÃ TOR nebo mÃstnÃ proxy"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "ZakÃ¡zat vÅ¡echny sÃtÄ?"
-
-#: 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 "VÃ½chozÃ nastavenÃ je ve vÄ?tÅ¡inÄ? situacÃ bezpeÄ?nÃ©. Chcete-li pÅ?idat vlastnÃ nastavenÃ, stisknÄ?te nÃÅ¾e tlaÄ?Ãtko \"+\"."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Heslo pro sprÃ¡vu"
-
-#: 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 "Vypnuto (vÃ½chozÃ)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_FalÅ¡ovÃ¡nÃ MAC adresy"
-
-#: 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 "Zapnuto (vÃ½chozÃ)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_SÃÅ¥ovÃ¡ pÅ?ipojenÃ"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Windows KamuflÃ¡Å¾"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Zapnout"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Vypnout"
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -722,6 +536,11 @@ msgstr "Nastavte heslo pro odemÄ?enÃ obrazovky."
 msgid "Password"
 msgstr "Heslo"
 
+#: 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 "Potvrdit"
+
 #: 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 "{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 ""
 
 #. 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 "{volume_name} (pouze ke Ä?tenÃ)"
 
 #. 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} v {container_path}"
@@ -855,14 +674,14 @@ msgstr "{partition_name} v {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} na {drive_name}"
@@ -871,42 +690,42 @@ msgstr "{partition_name} na {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 ""
 
-#: 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 "Heslo pro sprÃ¡vu"
+
+#: ../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 "Pokud potÅ?ebujete provÃ¡dÄ?t Ãºkoly sprÃ¡vy, nastavte administrÃ¡torskÃ© heslo. V opaÄ?nÃ©m pÅ?ÃpadÄ? je heslo pro sprÃ¡vu zakÃ¡zÃ¡no pro lepÅ¡Ã zabezpeÄ?enÃ."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Zadejte heslo pro sprÃ¡vu"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "PotvrÄ?te VaÅ¡e heslo pro sprÃ¡vu"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "ZakÃ¡zat"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "FalÅ¡ovÃ¡nÃ MAC adresy"
+
+#: ../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 "FalÅ¡ovÃ¡nÃ MAC adres skryje sÃ©riovÃ© Ä?Ãslo vaÅ¡eho sÃÅ¥ovÃ©ho rozhranÃ (Wi-Fi nebo kabelovÃ©ho) v mÃstnÃ sÃti. FalÅ¡ovÃ¡nÃ MAC adres je obecnÄ? bezpeÄ?nÄ?jÅ¡Ã, protoÅ¾e vÃ¡m pomÅ¯Å¾e skrÃ½t vaÅ¡e geografickÃ© umÃstÄ?nÃ. MÅ¯Å¾e to vÅ¡ak takÃ© zpÅ¯sobit problÃ©my s pÅ?ipojenÃm nebo vypadat podezÅ?ele."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "FalÅ¡ovat vÅ¡echny MAC adresy (vÃ½chozÃ)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "NefalÅ¡ovat MAC adresy"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Konfigurace sÃtÄ?"
+
+#: ../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 "Pokud je vaÅ¡e internetovÃ© pÅ?ipojenÃ cenzurovÃ¡no, filtrovÃ¡no nebo vyuÅ¾ÃvÃ¡ proxy, mÅ¯Å¾ete nakonfigurovat pÅ?emostÄ?nÃ Tor nebo mÃstnÃ proxy. Chcete-li pracovat zcela offline, mÅ¯Å¾ete zakÃ¡zat vÅ¡echna sÃÅ¥ovÃ¡ pÅ?ipojenÃ."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "PÅ?ipojit se pÅ?Ãmo k sÃti Tor (vÃ½chozÃ)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Konfigurace pÅ?emostÄ?nÃ TOR nebo mÃstnÃ proxy"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "ZakÃ¡zat vÅ¡echny sÃtÄ?"
+
+#: ../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 "Po pÅ?ipojenÃ k sÃti nakonfigurujete pÅ?emostÄ?nÃ Tor a lokÃ¡lnÃ proxy."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "VÃtejte v Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "undefined"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "VÃ½chozÃ nastavenÃ"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Å ifrovanÃ© _TrvalÃ© ÃºloÅ¾iÅ¡tÄ?"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Konfigurace TrvalÃ©ho ÃºloÅ¾iÅ¡tÄ?"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "Pro odemknutÃ trvalÃ©ho uloÅ¾iÅ¡tÄ? zadejte heslo"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Znovu zamÄ?Ãt trvalÃ© ÃºloÅ¾iÅ¡tÄ?"
+
+#: ../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 "TrvalÃ© ÃºloÅ¾iÅ¡tÄ? je odemÄ?eno. Restart Tails ho znovu uzamkne."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_DalÅ¡Ã nastavenÃ"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "PÅ?idat dalÅ¡Ã nastavenÃ"
+
+#: ../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 "VÃ½chozÃ nastavenÃ je ve vÄ?tÅ¡inÄ? situacÃ bezpeÄ?nÃ©. Chcete-li pÅ?idat vlastnÃ nastavenÃ, stisknÄ?te nÃÅ¾e tlaÄ?Ãtko \"+\"."
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "SouborovÃ© kontejnery"
diff --git a/cy.po b/cy.po
index 51256908e..bd60b6b6c 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 "_Llwythwch"
 msgid "_Exit"
 msgstr "_Gadael"
 
-#: 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 "Canslo"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
+msgstr "Ychwanegu"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
+msgstr "Yn Ã´l"
+
+#: 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:398
-msgid "Offline"
+#: 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: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:206
+msgid "_Network Connection"
 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:215
+msgid "Direct (default)"
 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:217
+msgid "Bridge & Proxy"
 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:219
+msgid "Offline"
 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:270
+msgid "On (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"
-msgstr "Canslo"
+#: 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:609
-msgid "Add"
-msgstr "Ychwanegu"
+#: 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:617
-msgid "Back"
-msgstr "Yn Ã´l"
+#: 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/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: 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"
@@ -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 "Cyfrinair"
 
+#: 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 "Mae gan y fersiwn yma o Tails problemau diogelwich hysbys:"
@@ -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 d109bcad0..450d9460a 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 "_Start"
 msgid "_Exit"
 msgstr "_Afslut"
 
-#: 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 "Direkte (standard)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Bro og proxy"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Frakoblet"
-
-#: 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 "LÃ¥s op"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Kunne ikke genlÃ¥s vedvarende lagring."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
-msgstr "LÃ¥ser opâ?¦"
-
-#: 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 "Kan ikke lÃ¥se krypteret lager op med denne adgangsfrase."
-
-#: 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 "Yderligere indstillinger"
 
-#: 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 "Annuller"
 
-#: 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 "TilfÃ¸j"
 
-#: 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 "Tilbage"
 
-#: 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 "_Administrationsadgangskode"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_MAC-adresse spoofing"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_NetvÃ¦rksforbindelse"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Direkte (standard)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Bro og proxy"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Frakoblet"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "Til (standard)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Til"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Fra"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Fra (standard)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "Luk ned"
 
-#: 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 "_Start 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 fejlede med returkode {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"
@@ -189,7 +191,7 @@ msgid ""
 "{stderr}"
 msgstr "cryptsetup fejlede med returkode {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"
@@ -197,7 +199,7 @@ msgid ""
 "{stderr}"
 msgstr "live-persist fejlede med returkode {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"
@@ -205,225 +207,37 @@ msgid ""
 "{stderr}"
 msgstr "umount fejlede med returkode {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 "Administrationsadgangskode"
-
-#: 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 "OpsÃ¦t en administrationsadgangskode hvis du har brug for at udfÃ¸re administrative opgaver. Ellers deaktiveres administrationsadgangskoden for at opnÃ¥ bedre sikkerhed."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Indtast en administrationsadgangskode"
-
-#: 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Ã¦ft"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "BekrÃ¦ft din administrationsadgangskode"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "DeaktivÃ©r"
-
-#. 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-camouflage"
-
-#. 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 "Denne valgmulighed fÃ¥r Tails til at se ud som Microsoft Windows 10. Det kan vÃ¦re nyttigt for at undgÃ¥ at tiltrÃ¦kke opmÃ¦rksomhed offentlige steder."
-
-#. 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-camouflage"
-
-#: 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-adresse spoofing"
-
-#: 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-adresse spoofing skjuler serienummeret af din netvÃ¦rksgrÃ¦nseflade (Wi-Fi eller kabel) til det lokale netvÃ¦rk. Spoofing MAC-adresser er generelt sikrere da det hjÃ¦lper dig med at skjule din geografiske placering. Men det kan mÃ¥ske ogsÃ¥ give forbindelsesproblemer eller se mistÃ¦nkeligt ud."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Spoof alle MAC-adresser (standard)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "Spoof ikke MAC-adresser"
-
-#: 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 "Du vil konfigurerer Tor-broen og lokal proxy senere efter der er oprettet forbindelse til et netvÃ¦rk."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Velkommen til 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 "Klik pÃ¥ <b>Take a Tour</b> ovenfor, for at blive guidet gennem Tails' indstillinger"
+#: 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 "LÃ¥s op"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Sprog og region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Kunne ikke genlÃ¥s vedvarende lagring."
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Standardindstillinger"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
+msgstr "LÃ¥ser opâ?¦"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Gem sprog- og regionsindstillinger"
+#: 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 "Kan ikke lÃ¥se krypteret lager op med denne adgangsfrase."
 
-#: 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 "S_prog"
 
-#: 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 "_Tastaturlayout"
 
-#: 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 "_Formater"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Tidszone"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Krypteret _vedvarende lager"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Vis adgangsfrase"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Konfigurer vedvarende lager"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "Indtast din adgangsfrase for at lÃ¥se det vedvarende lager op"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "LÃ¥s vedvarende lager igen"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "Dit vedvarende lager er lÃ¥st op. Genstart Tails for at lÃ¥se det igen."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_Yderligere indstillinger"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Gem yderligere indstillinger"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "TilfÃ¸j en yderligere indstilling"
-
-#: 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 "NetvÃ¦rkskonfiguration"
-
-#: 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 "Hvis din internetforbindelse er censureret, filtreret eller proxiet kan du konfigurere en Tor-bro eller en lokal proxy. Du kan deaktivere al brug af netvÃ¦rk for at arbejde helt offline."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Opret direkte forbindelse til Tor-netvÃ¦rket (standard)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Konfigurer en Tor-bro eller lokal proxy"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "DeaktivÃ©r al brug af netvÃ¦rk"
-
-#: 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 "Standardindstillingerne er sikre i de fleste situationer. Tryk pÃ¥ \"+\"-knappen nedenfor, for at tilfÃ¸je en tilpasset indstilling."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Administrationsadgangskode"
-
-#: 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 "Fra (standard)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_MAC-adresse spoofing"
-
-#: 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 "Til (standard)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_NetvÃ¦rksforbindelse"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Windows-camouflage"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Til"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Fra"
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -722,6 +536,11 @@ msgstr "OpsÃ¦t en adgangskode til at lÃ¥se skÃ¦rmen op."
 msgid "Password"
 msgstr "Adgangskode"
 
+#: 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Ã¦ft"
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr "Denne version af Tails har fÃ¸lgende kendte sikkerhedsproblemer:"
@@ -818,35 +637,35 @@ msgstr "Ã?bn onionkredslÃ¸b"
 
 #. 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} diskomrÃ¥de"
 
 #. 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} (skrivebeskyttet)"
 
 #. 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}"
@@ -855,14 +674,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}"
@@ -871,42 +690,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 "Forkert adgangskode eller parametre"
 
-#: 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 "Fejl ved oplÃ¥sning af diskomrÃ¥de"
 
 #. 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 "Kunne ikke lÃ¥se op for diskomrÃ¥det {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 "En eller flere programmer bruger diskomrÃ¥det."
 
 #. 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 "Kunne ikke lÃ¥se diskomrÃ¥det {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 "LÃ¥sning af diskomrÃ¥det mislykkedes"
 
@@ -1104,6 +923,130 @@ msgid ""
 " ($(command_line))"
 msgstr "Der krÃ¦ves autentifikation for at fjerne en pakke fra dine yderligere software ($(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 "Administrationsadgangskode"
+
+#: ../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 "OpsÃ¦t en administrationsadgangskode hvis du har brug for at udfÃ¸re administrative opgaver. Ellers deaktiveres administrationsadgangskoden for at opnÃ¥ bedre sikkerhed."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Indtast en administrationsadgangskode"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "BekrÃ¦ft din administrationsadgangskode"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "DeaktivÃ©r"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "MAC-adresse spoofing"
+
+#: ../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-adresse spoofing skjuler serienummeret af din netvÃ¦rksgrÃ¦nseflade (Wi-Fi eller kabel) til det lokale netvÃ¦rk. Spoofing MAC-adresser er generelt sikrere da det hjÃ¦lper dig med at skjule din geografiske placering. Men det kan mÃ¥ske ogsÃ¥ give forbindelsesproblemer eller se mistÃ¦nkeligt ud."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Spoof alle MAC-adresser (standard)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "Spoof ikke MAC-adresser"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "NetvÃ¦rkskonfiguration"
+
+#: ../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 "Hvis din internetforbindelse er censureret, filtreret eller proxiet kan du konfigurere en Tor-bro eller en lokal proxy. Du kan deaktivere al brug af netvÃ¦rk for at arbejde helt offline."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Opret direkte forbindelse til Tor-netvÃ¦rket (standard)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Konfigurer en Tor-bro eller lokal proxy"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "DeaktivÃ©r al brug af netvÃ¦rk"
+
+#: ../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 "Du vil konfigurerer Tor-broen og lokal proxy senere efter der er oprettet forbindelse til et netvÃ¦rk."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Velkommen til Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Sprog og region"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Standardindstillinger"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Krypteret _vedvarende lager"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Konfigurer vedvarende lager"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "Indtast din adgangsfrase for at lÃ¥se det vedvarende lager op"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "LÃ¥s vedvarende lager igen"
+
+#: ../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 "Dit vedvarende lager er lÃ¥st op. Genstart Tails for at lÃ¥se det igen."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_Yderligere indstillinger"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "TilfÃ¸j en yderligere indstilling"
+
+#: ../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 "Standardindstillingerne er sikre i de fleste situationer. Tryk pÃ¥ \"+\"-knappen nedenfor, for at tilfÃ¸je en tilpasset indstilling."
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "Filbeholdere"
diff --git a/de.po b/de.po
index 13cc312a1..d0ce08a32 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)"
-msgstr "Direkt (Vorgabe)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "BrÃ¼cke und Vermittlungsserver"
-
-#: 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 "Entsperren"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "BestÃ¤ndiger Speicherbereich konnte nicht wieder gesperrt werden."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
-msgstr "Wird entsperrtâ?¦"
-
-#: 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 "VerschlÃ¼sselter Speicherbereich kann mit dieser Passphrase nicht entsperrt werden."
-
-#: 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 "ZusÃ¤tzliche Einstellungen"
 
-#: 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 "Abbrechen"
 
-#: 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 "HinzufÃ¼gen"
 
-#: 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 "ZurÃ¼ck"
 
-#: 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 "_Administrationspasswort"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_Manipulation der MAC-Adresse"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_Netzwerkverbindung"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Direkt (Vorgabe)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "BrÃ¼cke und Vermittlungsserver"
+
+#: 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 "Ein (Vorgabe)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Ein"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Aus"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Aus (Vorgabe)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "Herunterfahren"
 
-#: 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 _starten"
 
-#. 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 ist mit Code {returncode} fehlgeschlagen:\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"
@@ -205,7 +207,7 @@ msgid ""
 "{stderr}"
 msgstr "cryptsetup ist mit Code {returncode} fehlgeschlagen:\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"
@@ -213,7 +215,7 @@ msgid ""
 "{stderr}"
 msgstr "live-persist fehlgeschlagen mit RÃ¼ckgabecode {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"
@@ -221,225 +223,37 @@ msgid ""
 "{stderr}"
 msgstr "umount ist mit Code {returncode} fehlgeschlagen:\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 "Administrationspasswort"
-
-#: 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 "Legen Sie ein Administrationspasswort fest, wenn Sie administrative Aufgaben ausÃ¼ben mÃ¼ssen. Andernfalls ist das Administrationspasswort deaktiviert, um bessere Sicherheit gewÃ¤hrleisten zu kÃ¶nnen."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Geben Sie ein Administrationspasswort ein"
-
-#: 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 "BestÃ¤tigen Sie Ihr Administrationspasswort"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Deaktivieren"
-
-#. 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-Tarnung"
-
-#. 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 "Diese Option lÃ¤sst Tails aussehen wie Microsoft Windows 10. Dies kann nÃ¼tzlich sein, um Verdacht auf Ã¶ffentlichen PlÃ¤tzen zu vermeiden."
-
-#. 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-Tarnung"
-
-#: 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 "Manipulation der MAC-Adresse"
-
-#: 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 "Durch die Manipulation der MAC-Adresse kann die Seriennummer der eigenen Netzwerkkarte (Wi-Fi oder Kabel) im lokalen Netzwerk verborgen werden. Dies hilft dabei, Ihren geografischen Standort geheim zu halten. Aber es kann auch zu Verbindungsproblemen fÃ¼hren oder verdÃ¤chtig wirken."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Alle MAC-Adressen manipulieren (Vorgabe)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "MAC-Adressen nicht manipulieren"
-
-#: 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 "Die Tor-BrÃ¼cke und den lokalen Vermittlungsserver (Proxy) spÃ¤ter nach dem Verbinden mit dem Netzwerk konfigurieren."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Willkommen bei 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 "Um eine FÃ¼hrung durch die Einstellungen von Tails zu erhalten, oben <b>Take a Tour</b> klicken."
+#: 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 "Entsperren"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Sprache & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "BestÃ¤ndiger Speicherbereich konnte nicht wieder gesperrt werden."
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Vorgabeeinstellungen"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
+msgstr "Wird entsperrtâ?¦"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Sprache- und Regionseinstellungen speichern"
+#: 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 "VerschlÃ¼sselter Speicherbereich kann mit dieser Passphrase nicht entsperrt werden."
 
-#: 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 "S_prache"
 
-#: 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 "_Tastaturbelegung"
 
-#: 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 "_Formate"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Zeitzone"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "VerschlÃ¼sselter _bestÃ¤ndiger Speicherbereich"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Passphrase anzeigen"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "BestÃ¤ndigen Speicherbereich konfigurieren"
-
-#. 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 "Geben Sie Ihre Passphrase ein, um die bestÃ¤ndigen Speicherbereich zu entsperren"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "BestÃ¤ndigen Speicherbereich wieder sperren"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "Ihr bestÃ¤ndiger Speicherbereich ist entsperrt. Starten Sie Tails neu, um ihn wieder zu sperren."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_ZusÃ¤tzliche Einstellungen"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "ZusÃ¤tzliche Einstellungen speichern"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "ZusÃ¤tzliche Einstellung hinzufÃ¼gen"
-
-#: 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 "Netzwerkkonfiguration"
-
-#: 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 "Wenn die Internetverbindung zensiert oder gefiltert wird, oder nur mit einem Vermittlungsserver (Proxy) funktioniert, kann eine Tor BrÃ¼cke oder ein lokaler Vermittlungsserver konfiguriert werden. Um vollstÃ¤ndig offline zu arbeiten, kÃ¶nnen die Netzwerkverbindungen zur GÃ¤nze deaktiviert werden."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Direkt mit dem Tor-Netzwerk verbinden (Vorgabe)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Tor-BrÃ¼cke oder lokalen Vermittlungsserver konfigurieren"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Alle Netzwerkfunktionen deaktivieren"
-
-#: 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 "Die Standardeinstellungen sind in den meisten Situationen sicher. Um benutzerdefinierte Einstellungen vorzunehmen, klicken Sie unten auf die SchaltflÃ¤che Â»+Â«."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Administrationspasswort"
-
-#: 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 "Aus (Vorgabe)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_Manipulation der MAC-Adresse"
-
-#: 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 "Ein (Vorgabe)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_Netzwerkverbindung"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Windows-Tarnung"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Ein"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Aus"
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -738,6 +552,11 @@ msgstr "Stellen Sie ein Passwort zum Sperren des Bildschirms ein."
 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 "Offene Onion-KanÃ¤le"
 
 #. 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} (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} in {container_path}"
@@ -871,14 +690,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} auf {drive_name}"
@@ -887,42 +706,42 @@ msgstr "{partition_name} auf {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 "Falsche Passphrase oder Parameter"
 
-#: 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 "Fehler beim Entsperren des Volumens"
 
 #. 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 "Volumen {volume_name}:{error_message} konnte nicht entsperrt werden"
 
-#: 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 "Eine oder mehrere Anwendungen halten den DatentrÃ¤ger ausgelastet."
 
 #. 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 "Der DatentrÃ¤ger {volume_name} konnte nicht gesperrt werden:\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 "Sperren des DatentrÃ¤gers fehlgeschlagen"
 
@@ -1120,6 +939,130 @@ msgid ""
 " ($(command_line))"
 msgstr "Authentifizierung wird benÃ¶tigt, um ein Paket von Ihrer zusÃ¤tzlichen Software-Liste zu entfernen ($(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 "Administrationspasswort"
+
+#: ../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 "Legen Sie ein Administrationspasswort fest, wenn Sie administrative Aufgaben ausÃ¼ben mÃ¼ssen. Andernfalls ist das Administrationspasswort deaktiviert, um bessere Sicherheit gewÃ¤hrleisten zu kÃ¶nnen."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Geben Sie ein Administrationspasswort ein"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "BestÃ¤tigen Sie Ihr Administrationspasswort"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Deaktivieren"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "Manipulation der MAC-Adresse"
+
+#: ../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 "Durch die Manipulation der MAC-Adresse kann die Seriennummer der eigenen Netzwerkkarte (Wi-Fi oder Kabel) im lokalen Netzwerk verborgen werden. Dies hilft dabei, Ihren geografischen Standort geheim zu halten. Aber es kann auch zu Verbindungsproblemen fÃ¼hren oder verdÃ¤chtig wirken."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Alle MAC-Adressen manipulieren (Vorgabe)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "MAC-Adressen nicht manipulieren"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Netzwerkkonfiguration"
+
+#: ../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 "Wenn die Internetverbindung zensiert oder gefiltert wird, oder nur mit einem Vermittlungsserver (Proxy) funktioniert, kann eine Tor BrÃ¼cke oder ein lokaler Vermittlungsserver konfiguriert werden. Um vollstÃ¤ndig offline zu arbeiten, kÃ¶nnen die Netzwerkverbindungen zur GÃ¤nze deaktiviert werden."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Direkt mit dem Tor-Netzwerk verbinden (Vorgabe)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Tor-BrÃ¼cke oder lokalen Vermittlungsserver konfigurieren"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Alle Netzwerkfunktionen deaktivieren"
+
+#: ../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 "Die Tor-BrÃ¼cke und den lokalen Vermittlungsserver (Proxy) spÃ¤ter nach dem Verbinden mit dem Netzwerk konfigurieren."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Willkommen bei Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Sprache & Region"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Vorgabeeinstellungen"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "VerschlÃ¼sselter _bestÃ¤ndiger Speicherbereich"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "BestÃ¤ndigen Speicherbereich konfigurieren"
+
+#. The label 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 "Geben Sie Ihre Passphrase ein, um die bestÃ¤ndigen Speicherbereich zu entsperren"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "BestÃ¤ndigen Speicherbereich wieder sperren"
+
+#: ../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 "Ihr bestÃ¤ndiger Speicherbereich ist entsperrt. Starten Sie Tails neu, um ihn wieder zu sperren."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_ZusÃ¤tzliche Einstellungen"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "ZusÃ¤tzliche Einstellung hinzufÃ¼gen"
+
+#: ../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 "Die Standardeinstellungen sind in den meisten Situationen sicher. Um benutzerdefinierte Einstellungen vorzunehmen, klicken Sie unten auf die SchaltflÃ¤che Â»+Â«."
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "Datei-Container"
diff --git a/el.po b/el.po
index 70eeb9c7f..ac1fd483a 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)"
-msgstr "Î?Ï?ÎµÏ?Î¸ÎµÎ¯Î±Ï? (Ï?Ï?Î¿ÎµÏ?Î¹Î»Î¿Î³Î®)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "_Î?ÎÏ?Ï?Ï?Î± & Proxy"
-
-#: 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 "_Î?Ï?Î´Î¹ÎºÏ?Ï? Î Ï?Ï?Ï?Î²Î±Ï?Î·Ï? Î?Î¹Î±Ï?ÎµÎ¹Ï?Î¹Ï?Ï?Î®"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_Î?Î»Î»Î¿Î¯Ï?Ï?Î· Î?Î¹ÎµÏ?Î¸Ï?Î½Ï?Î·Ï? MAC"
+
+#: 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 "_Î?ÎÏ?Ï?Ï?Î± & Proxy"
+
+#: 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"
 
-#. 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 Î±Ï?ÎÏ?Ï?Ï?Îµ Î¼Îµ Ï?Î¿Î½ ÎºÏ?Î´Î¹ÎºÏ? ÎµÏ?Î¹Ï?Ï?Ï?Î¿Ï?Î®Ï? {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"
@@ -197,7 +199,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"
@@ -205,7 +207,7 @@ msgid ""
 "{stderr}"
 msgstr "Ï?Î¿ live-persist Î±Ï?ÎÏ?Ï?Ï?Îµ Î¼Îµ Ï?Î¿Î½ ÎºÏ?Î´Î¹ÎºÏ? ÎµÏ?Î¹Ï?Ï?Ï?Î¿Ï?Î®Ï? {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"
@@ -213,225 +215,37 @@ msgid ""
 "{stderr}"
 msgstr "Ï?Î¿ umount Î±Ï?ÎÏ?Ï?Ï?Îµ Î¼Îµ Ï?Î¿Î½ ÎºÏ?Î´Î¹ÎºÏ? ÎµÏ?Î¹Ï?Ï?Ï?Î¿Ï?Î®Ï? {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 ÎºÏ?Ï?Î²ÎµÎ¹ Ï?Î¿Î½ Ï?ÎµÎ¹Ï?Î¹Î±ÎºÏ? Î±Ï?Î¹Î¸Î¼Ï? Ï?Ï?Î½ ÎºÎ±Ï?Ï?Ï?Î½ Î´Î¹ÎºÏ?Ï?Î¿Ï? Ï?Î±Ï? (Ethernet Î® Wi-Fi) Î³Î¹Î± Ï?Î± Ï?Î¿Ï?Î¹ÎºÎ¬ Î´Î¯ÎºÏ?Ï?Î±. Î?Ï?Ï?Ï? ÎµÎ¯Î½Î±Î¹ Î³ÎµÎ½Î¹ÎºÎ¬ Î±Ï?Ï?Î±Î»ÎÏ?Ï?ÎµÏ?Î¿ Î³Î¹Î±Ï?Î¯ Ï?Î±Ï? Î²Î¿Î·Î¸Î¬ÎµÎ¹ Î½Î± ÎºÏ?Ï?Î²ÎµÏ?Îµ Ï?Î· Î³ÎµÏ?Î³Ï?Î±Ï?Î¹ÎºÎ® Î¸ÎÏ?Î· Ï?Î±Ï?. Î?Ï?Î¿Ï?ÎµÎ¯ Ï?Î¼Ï?Ï? Î½Î± Î´Î·Î¼Î¹Î¿Ï?Ï?Î³Î®Ï?ÎµÎ¹ Ï?Ï?Î¿Î²Î»Î®Î¼Î±Ï?Î± Ï?Ï?Î½Î´ÎµÏ?Î¹Î¼Ï?Ï?Î·Ï?Î±Ï? Î® Î½Î± Ï?Î±Î¯Î½ÎµÏ?Î±Î¹ Ï?Ï?Î¿Ï?Ï?Î¿."
-
-#: 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 ÎºÎ±Î¹ Ï?Î¿Î½ Ï?Î¿Ï?Î¹ÎºÏ? proxy Î±Ï?Î³Ï?Ï?ÎµÏ?Î±, Î±Ï?Î¿Ï? Ï?Ï?Ï?Ï?Î± Ï?Ï?Î½Î´ÎµÎ¸ÎµÎ¯Ï?Îµ Ï?Îµ ÎÎ½Î± Î´Î¯ÎºÏ?Ï?Î¿."
-
-#: 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 "_Î?Î»Ï?Ï?Ï?Î±"
 
-#: 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 "Î¡Ï?Î¸Î¼Î¹Ï?Î· Persistent Storage"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/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 "_Î Ï?Ï?Ï?Î¸ÎµÏ?ÎµÏ? Î¡Ï?Î¸Î¼Î¯Ï?ÎµÎ¹Ï?"
-
-#: 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 "Î?Î¬Î½ Î· Ï?Ï?Î½Î´ÎµÏ?Î® Ï?Î±Ï? Ï?Ï?Î¿ Internet Î»Î¿Î³Î¿ÎºÏ?Î¯Î½ÎµÏ?Î±Î¹, Ï?Î¹Î»Ï?Ï?Î¬Ï?ÎµÏ?Î±Î¹ Î® Ï?ÎµÏ?Î½Î¬ÎµÎ¹ Î±Ï?Ï? Proxy, Î¼Ï?Î¿Ï?ÎµÎ¯Ï?Îµ Î½Î± Î´Î¹Î±Î¼Î¿Ï?Ï?Ï?Ï?ÎµÏ?Îµ Î¼Î¹Î± Î³ÎÏ?Ï?Ï?Î± Tor Î® ÎÎ½Î±Î½ Ï?Î¿Ï?Î¹ÎºÏ? Proxy. Î?Î¹Î± Î½Î± ÎµÏ?Î³Î±Ï?Ï?ÎµÎ¯Ï?Îµ Ï?ÎµÎ»ÎµÎ¯Ï?Ï? ÎµÎºÏ?Ï?Ï? Ï?Ï?Î½Î´ÎµÏ?Î·Ï?, Î¼Ï?Î¿Ï?ÎµÎ¯Ï?Îµ Î½Î± Î±Ï?ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¹Î®Ï?ÎµÏ?Îµ Ï?Î»ÎµÏ? Ï?Î¹Ï? Ï?Ï?Î½Î´ÎÏ?ÎµÎ¹Ï? Î´Î¹ÎºÏ?Ï?Î¿Ï?."
-
-#: 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 Î® ÎÎ½Î±Î½ Ï?Î¿Ï?Î¹ÎºÏ? proxy"
-
-#: 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 "_Î?Î»Î»Î¿Î¯Ï?Ï?Î· Î?Î¹ÎµÏ?Î¸Ï?Î½Ï?Î·Ï? 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 "Î?Î½Î¿Î¹Ï?Ï?Ï? (Ï?Ï?Î¿ÎµÏ?Î¹Î»Î¿Î³Î®)"
-
-#: 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 "_Î?Î±Î¼Î¿Ï?Ï?Î»Î¬Î¶ Windows"
-
-#: 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 "Î?Ï?Ï?Î® Î· ÎÎºÎ´Î¿Ï?Î· Ï?Ï?Î½ Tails ÎÏ?ÎµÎ¹ Î³Î½Ï?Ï?Ï?Î¬ Ï?Ï?Î¿Î²Î»Î®Î¼Î±Ï?Î± Î±Ï?Ï?Î±Î»ÎµÎ¯Î±Ï?:"
@@ -826,35 +645,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 "{partition_name}  Ï?Ï?Î¿ {container_path}"
@@ -863,14 +682,14 @@ msgstr "{partition_name}  Ï?Ï?Î¿ {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} Ï?Ï?Î¿Î½ {drive_name}"
@@ -879,42 +698,42 @@ msgstr "{partition_name} Ï?Ï?Î¿Î½ {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 "Î?Î¬Î¸Î¿Ï? Ï?Ï?Î½Î¸Î·Î¼Î±Ï?Î¹ÎºÏ? Î® Ï?Î±Ï?Î¬Î¼ÎµÏ?Ï?Î¿Î¹"
 
-#: 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 ""
 
-#: 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 "Î?Ï?Î±Î¹Ï?ÎµÎ¯Ï?Î±Î¹ Ï?Î±Ï?Ï?Î¿Ï?Î¿Î¯Î·Ï?Î· Î³Î¹Î± Ï?Î·Î½ Î±Ï?Î¿Î¼Î¬ÎºÏ?Ï?Î½Ï?Î· ÎµÎ½Ï?Ï? Ï?Î±ÎºÎÏ?Î¿Ï? Î±Ï?Ï? Ï?Î¿ Ï?Ï?Ï?Ï?Î¸ÎµÏ?Î¿ Î»Î¿Î³Î¹Ï?Î¼Î¹ÎºÏ? Ï?Î±Ï? ($(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 ÎºÏ?Ï?Î²ÎµÎ¹ Ï?Î¿Î½ Ï?ÎµÎ¹Ï?Î¹Î±ÎºÏ? Î±Ï?Î¹Î¸Î¼Ï? Ï?Ï?Î½ ÎºÎ±Ï?Ï?Ï?Î½ Î´Î¹ÎºÏ?Ï?Î¿Ï? Ï?Î±Ï? (Ethernet Î® Wi-Fi) Î³Î¹Î± Ï?Î± Ï?Î¿Ï?Î¹ÎºÎ¬ Î´Î¯ÎºÏ?Ï?Î±. Î?Ï?Ï?Ï? ÎµÎ¯Î½Î±Î¹ Î³ÎµÎ½Î¹ÎºÎ¬ Î±Ï?Ï?Î±Î»ÎÏ?Ï?ÎµÏ?Î¿ Î³Î¹Î±Ï?Î¯ Ï?Î±Ï? Î²Î¿Î·Î¸Î¬ÎµÎ¹ Î½Î± ÎºÏ?Ï?Î²ÎµÏ?Îµ Ï?Î· Î³ÎµÏ?Î³Ï?Î±Ï?Î¹ÎºÎ® Î¸ÎÏ?Î· Ï?Î±Ï?. Î?Ï?Î¿Ï?ÎµÎ¯ Ï?Î¼Ï?Ï? Î½Î± Î´Î·Î¼Î¹Î¿Ï?Ï?Î³Î®Ï?ÎµÎ¹ Ï?Ï?Î¿Î²Î»Î®Î¼Î±Ï?Î± Ï?Ï?Î½Î´ÎµÏ?Î¹Î¼Ï?Ï?Î·Ï?Î±Ï? Î® Î½Î± Ï?Î±Î¯Î½ÎµÏ?Î±Î¹ Ï?Ï?Î¿Ï?Ï?Î¿."
+
+#: ../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 "Î?Î¬Î½ Î· Ï?Ï?Î½Î´ÎµÏ?Î® Ï?Î±Ï? Ï?Ï?Î¿ Internet Î»Î¿Î³Î¿ÎºÏ?Î¯Î½ÎµÏ?Î±Î¹, Ï?Î¹Î»Ï?Ï?Î¬Ï?ÎµÏ?Î±Î¹ Î® Ï?ÎµÏ?Î½Î¬ÎµÎ¹ Î±Ï?Ï? Proxy, Î¼Ï?Î¿Ï?ÎµÎ¯Ï?Îµ Î½Î± Î´Î¹Î±Î¼Î¿Ï?Ï?Ï?Ï?ÎµÏ?Îµ Î¼Î¹Î± Î³ÎÏ?Ï?Ï?Î± Tor Î® ÎÎ½Î±Î½ Ï?Î¿Ï?Î¹ÎºÏ? Proxy. Î?Î¹Î± Î½Î± ÎµÏ?Î³Î±Ï?Ï?ÎµÎ¯Ï?Îµ Ï?ÎµÎ»ÎµÎ¯Ï?Ï? ÎµÎºÏ?Ï?Ï? Ï?Ï?Î½Î´ÎµÏ?Î·Ï?, Î¼Ï?Î¿Ï?ÎµÎ¯Ï?Îµ Î½Î± Î±Ï?ÎµÎ½ÎµÏ?Î³Î¿Ï?Î¿Î¹Î®Ï?ÎµÏ?Îµ Ï?Î»ÎµÏ? Ï?Î¹Ï? Ï?Ï?Î½Î´ÎÏ?ÎµÎ¹Ï? Î´Î¹ÎºÏ?Ï?Î¿Ï?."
+
+#: ../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 Î® ÎÎ½Î±Î½ Ï?Î¿Ï?Î¹ÎºÏ? proxy"
+
+#: ../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 ÎºÎ±Î¹ Ï?Î¿Î½ Ï?Î¿Ï?Î¹ÎºÏ? proxy Î±Ï?Î³Ï?Ï?ÎµÏ?Î±, Î±Ï?Î¿Ï? Ï?Ï?Ï?Ï?Î± Ï?Ï?Î½Î´ÎµÎ¸ÎµÎ¯Ï?Îµ Ï?Îµ ÎÎ½Î± Î´Î¯ÎºÏ?Ï?Î¿."
+
+#: ../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 "Î?Ï?Ï?Ï?Ï?Î¿Î³Ï?Î±Ï?Î·Î¼ÎÎ½Î¿Ï? _Î?Ï?Î½Î¹Î¼Î¿Ï? Î§Ï?Ï?Î¿Ï? Î?Ï?Î¿Î¸Î®ÎºÎµÏ?Ï?Î·Ï?"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Î¡Ï?Î¸Î¼Î¹Ï?Î· Persistent Storage"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in: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 "_Î Ï?Ï?Ï?Î¸ÎµÏ?ÎµÏ? Î¡Ï?Î¸Î¼Î¯Ï?ÎµÎ¹Ï?"
+
+#: ../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 d2fe6c339..71538e58f 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 "_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)"
-msgstr "Direct (default)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Bridge & 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 "Unlock"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Failed to relock persistent storage."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
-msgstr "Unlockingâ?¦"
-
-#: 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 "Cannot unlock encrypted storage with this passphrase."
-
-#: 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 "Additional Settings"
 
-#: 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 "Cancel"
 
-#: 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 "Add"
 
-#: 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 "Back"
 
-#: 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 "_Administration Password"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_MAC Address Spoofing"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_Network Connection"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Direct (default)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Bridge & 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 "On (default)"
+
+#: 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 (default)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: 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 "_Start 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 failed with return code {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"
@@ -180,7 +182,7 @@ msgid ""
 "{stderr}"
 msgstr "cryptsetup failed with return code {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"
@@ -188,7 +190,7 @@ msgid ""
 "{stderr}"
 msgstr "live-persist failed with return code {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"
@@ -196,225 +198,37 @@ msgid ""
 "{stderr}"
 msgstr "umount failed with return code {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 "Administration Password"
-
-#: 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 "Enter an administration password in case you need to perform administration tasks.\nOtherwise it will be disabled for better security."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Tor Browser uses the Tor network to protect your privacy and anonymity. Using the Tor network has two main properties:"
-
-#: 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 "Confirm your administration password"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Disable"
-
-#. 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 Camouflage"
-
-#. 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 option makes Tails look like Microsoft Windows 10. This can be useful to avoid attracting suspicion in public places."
-
-#. 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 camouflage"
-
-#: 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 Address Spoofing"
-
-#: 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 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."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Spoof all MAC addresses (default)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "Don't spoof MAC addresses"
-
-#: 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 "You will configure the Tor bridge and local proxy later on after connecting to a network."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Welcome to 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 "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 "Unlock"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Failed to relock persistent storage."
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
+msgstr "Unlockingâ?¦"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "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 "Cannot unlock encrypted storage with this passphrase."
 
-#: 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 "_Language"
 
-#: 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 "_Keyboard Layout"
 
-#: 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 "_Time Zone"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Encrypted _Persistent Storage"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Show Passphrase"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Configure Persistent Storage"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "Enter your passphrase to unlock the persistent storage"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Relock Persistent Storage"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "Your persistent storage is unlocked. Restart Tails to lock it again."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_Additional Settings"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Save Additional Settings"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Add an additional setting"
-
-#: 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 "Network Configuration"
-
-#: 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 "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."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Connect directly to the Tor network (default)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Configure a Tor bridge or local proxy"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Disable all networking"
-
-#: 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 "The default settings are safe in most situations. To add a custom setting, press the \"+\" button below."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Administration Password"
-
-#: 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 (default)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_MAC Address Spoofing"
-
-#: 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 (default)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_Network Connection"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Windows Camouflage"
-
-#: 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 ""
@@ -713,6 +527,11 @@ msgstr "Set up a password to unlock the screen."
 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 "Confirm"
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr "This version of Tails has known security issues:"
@@ -809,35 +628,35 @@ msgstr "Open 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} 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} (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} in {container_path}"
@@ -846,14 +665,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} on {drive_name}"
@@ -862,42 +681,42 @@ msgstr "{partition_name} on {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 "Wrong passphrase or parameters"
 
-#: 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 unlocking 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 "Couldn't unlock 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 ""
 
 #. 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 "Authentication is required to remove a package from your additional software ($(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 "Administration Password"
+
+#: ../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 "Enter an administration password in case you need to perform administration tasks.\nOtherwise it will be disabled for better security."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Tor Browser uses the Tor network to protect your privacy and anonymity. Using the Tor network has two main properties:"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Confirm your administration password"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Disable"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "MAC Address Spoofing"
+
+#: ../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 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."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Spoof all MAC addresses (default)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "Don't spoof MAC addresses"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Network Configuration"
+
+#: ../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 "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."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Connect directly to the Tor network (default)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Configure a Tor bridge or local proxy"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Disable all networking"
+
+#: ../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 "You will configure the Tor bridge and local proxy later on after connecting to a network."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Welcome to Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Language & Region"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Default Settings"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Encrypted _Persistent Storage"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Configure Persistent Storage"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "Enter your passphrase to unlock the persistent storage"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Relock Persistent Storage"
+
+#: ../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 "Your persistent storage is unlocked. Restart Tails to lock it again."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_Additional Settings"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Add an additional setting"
+
+#: ../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 "The default settings are safe in most situations. To add a custom setting, press the \"+\" button below."
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "File Containers"
diff --git a/eo.po b/eo.po
index 6490825f4..c58fddbc0 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 "_Å?alti"
 msgid "_Exit"
 msgstr "_Eliri"
 
-#: 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 "Rezigni"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
+msgstr "Aldoni"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
+msgstr "Reen"
+
+#: 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:398
-msgid "Offline"
+#: 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: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:206
+msgid "_Network Connection"
 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:215
+msgid "Direct (default)"
 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:217
+msgid "Bridge & Proxy"
 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:219
+msgid "Offline"
 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:270
+msgid "On (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"
-msgstr "Rezigni"
+#: 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:609
-msgid "Add"
-msgstr "Aldoni"
+#: 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:617
-msgid "Back"
-msgstr "Reen"
+#: 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/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: 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"
@@ -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 "Malfunkciigi Ä?iuj retoj"
-
-#: 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 "Pasvorto"
 
+#: 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 "Tiu Ä?i verzio de Tails havas famajn sekurecajn problemojn:"
@@ -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 "Malfunkciigi Ä?iuj retoj"
+
+#: ../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 1b7bc9521..d1368776b 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 d721f5a77..e98bbd435 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)"
-msgstr "Directo (por defecto)"
-
-#: 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 "Fuera de lÃnea"
-
-#: 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 "Fallo en volver a bloquear 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 encriptado con esta frase de 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 "Configuraciones Adicionales"
 
-#: 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 "Agregar"
 
-#: 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 "AtrÃ¡s"
 
-#: 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 "_Clave de AdministraciÃ³n"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "FalsificaciÃ³n de direcciÃ³n _MAC"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+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 "Directo (por defecto)"
+
+#: 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 "Fuera de lÃnea"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "Encendido (por defecto)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Prendido"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Apagado"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Apagado (por defecto)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "Apagar"
 
-#: 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 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"
@@ -182,7 +184,7 @@ msgid ""
 "{stderr}"
 msgstr "cryptsetup fallÃ³ con 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"
@@ -190,7 +192,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"
@@ -198,225 +200,37 @@ msgid ""
 "{stderr}"
 msgstr "umount fallÃ³ con 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 "ConfigurÃ¡ una contraseÃ±a de administraciÃ³n si necesitÃ¡s realizar alguna tarea administrativa. Si no lo hacÃ©s, la contraseÃ±a de administraciÃ³n se deshabilita para mayor seguridad."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "IngresÃ¡ 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 "ConfirmÃ¡ 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 de 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 a Tails parecer como Microsoft Windows 10. Esto puede ser Ãºtil para evitar atraer sospecha 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 de 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 "FalsificaciÃ³n 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 "La falsificaciÃ³n de la direcciÃ³n MAC oculta el nÃºmero de serie de tu interfaz de red (Wi-Fi o cableada) a la red local. Esta tÃ©cnica es generalmente mÃ¡s segura ya que te ayuda a esconder tu ubicaciÃ³n geogrÃ¡fica. Pero tambiÃ©n puede crear problemas de conectividad o parecer sospechoso."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Falsificar todas las direcciones MAC (por defecto)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "No falsificar las 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 "Vas a configurar el puente Tor y el proxy local luego, despuÃ©s de conectar a una red."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/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 ser guiado a travÃ©s de los ajustes de Tails, cliqueÃ¡ arriba en <b>Tomar un tour</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 "Fallo en volver a bloquear almacenamiento persistente"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "ConfiguraciÃ³n por defecto"
+#: 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 RegiÃ³n"
+#: 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 encriptado con esta frase de 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 "DistribuciÃ³n 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 Horaria"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Almacenamiento encriptado _Persistente"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Mostrar Frase de ContraseÃ±a"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Configurar el 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 "IngresÃ¡ tu frase de contraseÃ±a para desbloquear el almacenamiento persistente"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Volver a bloquear 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. ReiniciÃ¡ Tails para bloquearlo de nuevo."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "Ajustes _Adicionales"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Guardar Configuraciones Adicionales"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Agregar 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 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 canalizada a travez de un tercero, podÃ©s configurar un puente Tor o un proxy local. Para trabajar completamente fuera de lÃnea, podÃ©s deshabilitar todas las funciones 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 de Tor (por defecto)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Configurar un puente Tor o proxy local"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Deshabilitar todas las funciones 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 "Los ajustes por defecto son seguros en la mayorÃa de las situaciones. Para aÃ±adir un ajuste personalizado, presionÃ¡ el botÃ³n \"+\" que estÃ¡ abajo."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Clave 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 "Apagado (por defecto)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "FalsificaciÃ³n 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 "Encendido (por defecto)"
-
-#: 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 de _Windows"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Prendido"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Apagado"
-
 #: 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 "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 "ConfigurÃ¡ una contraseÃ±a de administraciÃ³n si necesitÃ¡s realizar alguna tarea administrativa. Si no lo hacÃ©s, la contraseÃ±a de administraciÃ³n se deshabilita para mayor seguridad."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "IngresÃ¡ 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 "ConfirmÃ¡ 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 "FalsificaciÃ³n 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 "La falsificaciÃ³n de la direcciÃ³n MAC oculta el nÃºmero de serie de tu interfaz de red (Wi-Fi o cableada) a la red local. Esta tÃ©cnica es generalmente mÃ¡s segura ya que te ayuda a esconder tu ubicaciÃ³n geogrÃ¡fica. Pero tambiÃ©n puede crear problemas de conectividad o parecer sospechoso."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Falsificar todas las direcciones MAC (por defecto)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "No falsificar las direcciones MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "ConfiguraciÃ³n de 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 canalizada a travez de un tercero, podÃ©s configurar un puente Tor o un proxy local. Para trabajar completamente fuera de lÃnea, podÃ©s deshabilitar todas las funciones 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 de Tor (por defecto)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Configurar un puente Tor o proxy local"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Deshabilitar todas las funciones 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 "Vas a configurar el puente Tor y el proxy local luego, despuÃ©s de conectar a una red."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+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 por defecto"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Almacenamiento encriptado _Persistente"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Configurar el 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 "IngresÃ¡ tu frase de contraseÃ±a para desbloquear el almacenamiento persistente"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Volver a bloquear 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. ReiniciÃ¡ Tails para bloquearlo de nuevo."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "Ajustes _Adicionales"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Agregar 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 "Los ajustes por defecto son seguros en la mayorÃa de las situaciones. Para aÃ±adir un ajuste personalizado, presionÃ¡ el botÃ³n \"+\" que estÃ¡ abajo."
+
 #: ../config/chroot_local-includes/usr/share/tails/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 1680e1e81..67914245f 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 "_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)"
-msgstr "Directo (predeterminado)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Puente & Proxy"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Fuera de Linea"
-
-#: 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 "Abrir"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Falla en cerrar de nuevo 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 descifrar el almacenamiento cifrardo con esta 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 "Configuracion 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 "Agregar"
 
-#: 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 "AtrÃ¡s"
 
-#: 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 "_Clave de Administrador"
+
+#: 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 "_ConexiÃ³n de Red"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Directo (predeterminado)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Puente & Proxy"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Fuera de Linea"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "Encendido (predeterminado)"
+
+#: 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 "Apagado (predeterminado)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "Apagar"
 
-#: 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 "predeterminado: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 ""
 
-#: 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 "Clave 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 "Pon una clave de administraciÃ³n si necesitas realizar actividades administrativas. De otra manera, la clave de administraciÃ³n sera desactivada para tener mejor seguridad. "
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Introduce una clave 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 clave de administraciÃ³n "
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Desactivar"
-
-#. 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 "Camuflage 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 opcion hace que Tails parezca Microsoft Windows 10. Esto puede ser util para evitar sospechas en espacios publicos."
-
-#. 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 "El camuflaje 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 "DirecciÃ³n Mac Spoofing"
-
-#: 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 "La direcciÃ³n spoofing de Mac esconde el numero de serie de tu interfaz de red (Wi-Fi o alÃ¡mbrica) a la red local. Direcciones Spoofing Mac son generalmente mas seguras por que te ayudan a esconder tu locaciÃ³n geogrÃ¡fica. Pero tambiÃ©n pueden crear problemas de conexiÃ³n o parecer sospechosas. "
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Spoofear todas las direcciones Mac (por defaulto) "
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "No falsificar 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 "Tu configuraras el puente Tor y el proxy local despuÃ©s de conectarse a una 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 ser guiado por la configuraciÃ³n de Tails, clickea en <b>Tomar Tur</b> arriba"
+#: 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 "Abrir"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Lenguaje 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 "Falla en cerrar de nuevo el almacenamiento persistente."
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "ConfiguraciÃ³n Estandar"
+#: 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 Lenguaje y Region"
+#: 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 descifrar el almacenamiento cifrardo con esta 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 "_Lenguaje"
 
-#: 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 "_DistribuciÃ³n 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 Horaria"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Almacenamiento _Cifrado Persistente"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Muestra la frase clave"
-
-#: 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 fraseclave para abrir el almacenamiento persistente"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Cerrar 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 esta abierto. Reinicia Tails para cerrarlo de nuevo."
-
-#: 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 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 su conexiÃ³n al internet esta censurada, filtrada u usada atravÃ©z de un proxy, es possible que usted pueda configurar un puente Tor u un proxy local. Para trabajar completamente fuera de lÃnea, puede desactivar por completo todas las redes."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Conectase directamente a la red Tor automÃ¡ticamente (predeterminado)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Configurar un puente Tor u un proxy local"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Desactivar toda actividad."
-
-#: 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 son seguras en la mayorÃa de las situaciones. Para aÃ±adir una configuraciÃ³n personal, haga clic en el button \"+\" abajo."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Clave de Administrador"
-
-#: 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 "Apagado (predeterminado)"
-
-#: 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 "Encendido (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 Windows"
-
-#: 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 "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:"
@@ -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 "Clave 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 "Pon una clave de administraciÃ³n si necesitas realizar actividades administrativas. De otra manera, la clave de administraciÃ³n sera desactivada para tener mejor seguridad. "
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Introduce una clave de administraciÃ³n"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Confirma tu clave de administraciÃ³n "
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Desactivar"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "DirecciÃ³n Mac Spoofing"
+
+#: ../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 "La direcciÃ³n spoofing de Mac esconde el numero de serie de tu interfaz de red (Wi-Fi o alÃ¡mbrica) a la red local. Direcciones Spoofing Mac son generalmente mas seguras por que te ayudan a esconder tu locaciÃ³n geogrÃ¡fica. Pero tambiÃ©n pueden crear problemas de conexiÃ³n o parecer sospechosas. "
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Spoofear todas las direcciones Mac (por defaulto) "
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "No falsificar direcciones MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "ConfiguraciÃ³n de 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 su conexiÃ³n al internet esta censurada, filtrada u usada atravÃ©z de un proxy, es possible que usted pueda configurar un puente Tor u un proxy local. Para trabajar completamente fuera de lÃnea, puede desactivar por completo todas las redes."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Conectase directamente a la red Tor automÃ¡ticamente (predeterminado)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Configurar un puente Tor u un proxy local"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Desactivar toda actividad."
+
+#: ../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 "Tu configuraras el puente Tor y el proxy local despuÃ©s de conectarse a una red."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Bienvenido a Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Lenguaje y RegiÃ³n"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "ConfiguraciÃ³n Estandar"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Almacenamiento _Cifrado Persistente"
+
+#: ../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 fraseclave para abrir el almacenamiento persistente"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Cerrar 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 esta abierto. Reinicia Tails para cerrarlo de nuevo."
+
+#: ../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 son seguras en la mayorÃa de las situaciones. Para aÃ±adir una configuraciÃ³n personal, haga clic en el button \"+\" abajo."
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/et.po b/et.po
index bd4d4a656..fe0978e5b 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 "_KÃ¤ivita"
 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 "Katkesta"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
+msgstr "Lisa"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
+msgstr "Tagasi"
+
+#: 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:398
-msgid "Offline"
+#: 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: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 "Ava"
+#: 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:482
-msgid "Failed to relock persistent storage."
+#: 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:500
-msgid "Unlockingâ?¦"
+#: 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: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:219
+msgid "Offline"
 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:270
+msgid "On (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"
-msgstr "Katkesta"
+#: 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:609
-msgid "Add"
-msgstr "Lisa"
+#: 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:617
-msgid "Back"
-msgstr "Tagasi"
+#: 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/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: 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"
@@ -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 "Administreerimise parool"
-
-#: 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 "Sisesta administreerimise parool"
-
-#: 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 "Kinnita"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Kinnita oma administreerimise parool"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Keela"
-
-#. 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/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 "Ava"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
 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:79
+msgid "Unlockingâ?¦"
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Keel ja piiskond"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Vaikeseaded"
-
-#: 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 "_Keel"
 
-#: 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 "_AjavÃ¶Ã¶nd"
-
-#: 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 "Parool"
 
+#: 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 "Kinnita"
+
 #: 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 "Avatud Onion-ringteed"
 
 #. 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 "Administreerimise parool"
+
+#: ../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 "Sisesta administreerimise parool"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Kinnita oma administreerimise parool"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Keela"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in: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 "Keel ja piiskond"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Vaikeseaded"
+
+#: ../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 f215c0e7a..80e967686 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 "_Abiarazi"
 msgid "_Exit"
 msgstr "_Irten"
 
-#: 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 "Zubia eta proxia"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Lineaz kanpo"
-
-#: 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 "Desblokeatu"
-
-#: 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 "Desblokeatzen..."
-
-#: 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 "Ezarpen gehigarriak"
 
-#: 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 "Utzi"
 
-#: 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 "Gehitu"
 
-#: 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 "Atzera"
 
-#: 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 "_Administrazio Pasahitza"
+
+#: 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 "_Sare Konexioa"
+
+#: 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 "Zubia eta proxia"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Lineaz kanpo"
+
+#: 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 "Itzali"
 
-#: 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 "_Abiarazi 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 ""
-
-#: 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"
@@ -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 "Administrazio Pasahitza"
-
-#: 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 "Sartu kudeatzailearen pasahitza"
-
-#: 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 "Baieztatu"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Berretsi zure administratzaile pasahitza"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Desgaitu"
-
-#. 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 kamuflaia"
-
-#. 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 "Microsoft Windows 10 kamuflaia"
-
-#: 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/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 "Desblokeatu"
 
-#: 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."
+#: 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:531
-msgid "Welcome to Tails!"
-msgstr "Ongi etorri Tails-era"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
+msgstr "Desblokeatzen..."
 
-#. 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: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:581
-msgid "Language & Region"
-msgstr "Hizkuntza eta eskualdea"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Ezarpen lehenetsiak"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Gorde Hizkuntza eta Herrialde Ezarpenak"
-
-#: 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 "_Hizkuntza"
 
-#: 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 "_Teklatuaren Diseinua"
 
-#: 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 "_Formatuak"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Ordu-zona"
-
-#: 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 "Erakutsi Sar-esaldia"
-
-#: 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 "_Ezarpen Gehiagarriak"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Gorde ezarpen gehigarriak"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Gehitu ezarpen gehigarria"
-
-#: 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 "Sare Ezarpenak"
-
-#: 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 "Ezgaitu konexio guztiak"
-
-#: 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 "_Administrazio Pasahitza"
-
-#: 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 "_Sare Konexioa"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Windows kamuflaia"
-
-#: 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 "Sarhitza"
 
+#: 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 "Baieztatu"
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr "Tails-eko bertsio honek egiaztatu diren segurtasun arazoak dauzka:"
@@ -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 "Administrazio Pasahitza"
+
+#: ../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 "Sartu kudeatzailearen pasahitza"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Berretsi zure administratzaile pasahitza"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Desgaitu"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in: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 "Sare Ezarpenak"
+
+#: ../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 "Ezgaitu konexio guztiak"
+
+#: ../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 "Ongi etorri Tails-era"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Hizkuntza eta eskualdea"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Ezarpen lehenetsiak"
+
+#: ../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 "_Ezarpen Gehiagarriak"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Gehitu ezarpen gehigarria"
+
+#: ../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 a90fe70f1..91bcdcc88 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)"
-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 "_Ú¯Ø°Ø± Ù?Ø§Ú?Ù? Ù?Ø¯Û?Ø±Û?Øª"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_Ø¬Ø¹Ù? Ø¢Ø¯Ø±Ø³ MAC"
+
+#: 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 "Ù¾Ù? Ù? Ù¾Ø±Ù?Ú©Ø³Û?"
+
+#: 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 "_Ø¢ØºØ§Ø² TailÙ?Ø§"
 
-#. 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 "Ù¾Û?Ø´ Ù?Ø±Ø¶: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 Ù?Ù?Ù?Ù? Ù?Ø¨Ù?Ø¯ Ø¨Ø§ Ú©Ø¯ Ø¨Ø§Ø²Ú¯Ø´Øª {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"
@@ -202,7 +204,7 @@ msgid ""
 "{stderr}"
 msgstr "cryptsetup  Ù?Ø§Ù?Ù?Ù?Ù? Ø¨Ù?Ø¯ Ø¨Ø§ Ú©Ø¯ Ø¨Ø§Ø²Ú¯Ø´Øª  {returncode}:  {stdout}  {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"
@@ -210,7 +212,7 @@ msgid ""
 "{stderr}"
 msgstr "live-persist Ù?Ù?Ù?Ù? Ù?Ø¨Ù?Ø¯ Ø¨Ø§ Ú©Ø¯ Ø¨Ø§Ø²Ú¯Ø´Øª {returncode}:  {stdout}  {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"
@@ -218,225 +220,37 @@ msgid ""
 "{stderr}"
 msgstr "Ø¯Ø³ØªÙ?Ø± umount Ù?Ù?Ù?Ù? Ù?Ø¨Ù?Ø¯ Ø¨Ø§ Ú©Ø¯ Ø¨Ø§Ø²Ú¯Ø´Øª {returncode}:  {stdout}  {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 "Ù¾Ù?Ø´Ø´ Ù?Û?Ù?Ø¯Ù?Ø²"
-
-#. 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 "Ø§Û?Ù? Ú¯Ø²Û?Ù?Ù?, Ù?Ø³Û?Ø±Ù?Ø§ Ø±Ø§ Ù?Ø§Ù?Ù?Ø¯ Ù?Ø§Û?Ú©Ø±Ù?Ø³Ø§Ù?Øª Ù?Û?Ù?Ø¯Ù?Ø² 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 "Ù?Ø§Û?Ú©Ø±Ù?Ø³Ø§Ù?Øª Ù?Û?Ù?Ø¯Ù?Ø² 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 "ØÙ?Ù? Ø¨Ø§Ø²Û? Ù?Ú© Ø¢Ø¯Ø±Ø³"
-
-#: 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 "Ø¬Ø¹Ù? Ù?Ù?Ù? Ø¢Ø¯Ø±Ø³ Ù?Ø§Û? 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 "Ø´Ù?Ø§ Ù¾Ø³ Ø§Ø² Ø§ØªØµØ§Ù? Ø¨Ù? Ø´Ø¨Ú©Ù?, Ù¾Ù? ØªÙ?Ø± Ù? Ù¾Ø±Ù?Ú©Ø³Û? Ù?ØÙ?Û? Ø±Ø§ Ø¨Ø¹Ø¯Ø§ Ù¾Û?Ú©Ø±Ø¨Ù?Ø¯Û? Ø®Ù?Ø§Ù?Û?Ø¯ Ú©Ø±Ø¯."
-
-#: 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"
-msgstr "Ø¨Ø±Ø§Û? Ø¨Ø¯Ø³Øª Ø¢Ù?Ø±Ø¯Ù? Ú©Ù?Ú© Ø§Ø² Ø·Ø±Û?Ù? Ù?Ø³Û?Ø±Ù?Ø§, ØªÙ?Ø¸Û?Ù?Ø§Øª, Ø±Ù?Û? <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 "_Ø²Ø¨Ø§Ù?"
 
-#: 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 "Ø°Ø®Û?Ø±Ù? Ø¯Ø§Ø¦Ù?Û? Ø¨Ø§Ø² Ø´Ø¯. Ø¨Ø±Ø§Û? Ù?Ù?Ù? Ú©Ø±Ø¯Ù?, Tail Ù?Ø§ Ø±Ø§ Ø±Û? Ø§Ø³ØªØ§Ø±Øª Ú©Ù?Û?Ø¯"
-
-#: 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 "_Ø¬Ø¹Ù? Ø¢Ø¯Ø±Ø³ 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 "Ø±Ù?Ø´Ù? (Ù¾Û?Ø´ Ù?Ø±Ø¶)"
-
-#: 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 "Ø§Û?Ù? Ù?Ø³Ø®Ù? Ø§Ø² Tails Ø§Û?Ù? Ù?Ø´Ú©Ù?Ø§Øª Ø§Ù?Ù?Û?Øª Ø´Ù?Ø§Ø®ØªÙ? Ø´Ø¯Ù? Ø±Ø§ Ø¯Ø§Ø±Ø¯:"
@@ -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 "{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 "{partition_name} Ø¯Ø± {container_path}"
@@ -868,14 +687,14 @@ msgstr "{partition_name} Ø¯Ø± {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} Ø¨Ø± Ø±Ù?Û? {drive_name}"
@@ -884,42 +703,42 @@ msgstr "{partition_name} Ø¨Ø± Ø±Ù?Û? {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 "Ú©Ù?Ù?Ù? Ø¹Ø¨Ù?Ø± Û?Ø§ Ù¾Ø§Ø±Ø§Ù?ØªØ± ØºÙ?Ø·"
 
-#: 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 ""
 
@@ -1117,6 +936,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 "ØÙ?Ù? Ø¨Ø§Ø²Û? Ù?Ú© Ø¢Ø¯Ø±Ø³"
+
+#: ../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 "Ø¬Ø¹Ù? Ù?Ù?Ù? Ø¢Ø¯Ø±Ø³ Ù?Ø§Û? 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 "Ø§Ú¯Ø± Ø§Ø±ØªØ¨Ø§Ø· Ø¨Ø§ Ø§Û?Ù?ØªØ±Ù?Øª Ø´Ù?Ø§ Ø³Ø§Ù?Ø³Ù?Ø±Ø? Ù?Û?Ù?ØªØ± Ù? Û?Ø§ Ù¾Ø±Ù?Ú©Ø³Û? Ø´Ø¯Ù?Ø? Ø´Ù?Ø§ Ù?Û?â??ØªÙ?Ø§Ù?Û?Ø¯ Û?Ú© Ù¾Ù? ØªÙ?Ø± Û?Ø§ Ù¾Ø±Ù?Ú©Ø³Û? Ù?ØÙ?Û? Ø±Ø§ ØªÙ?Ø¸Û?Ù? Ú©Ù?Û?Ø¯. Ø¨Ø±Ø§Û? Ø§Û?Ù? Ú©Ù? Ú©Ø§Ù?Ù?Ø§ Ø¢Ù?Ù?Ø§Û?Ù? Ú©Ø§Ø± Ú©Ù?Û?Ø¯Ø? Ù?Û?â??ØªÙ?Ø§Ù?Û?Ø¯ ØªÙ?Ø§Ù? Ø´Ø¨Ú©Ù? Ø±Ø§ ØºÛ?Ø±Ù?Ø¹Ø§Ù? Ú©Ù?Û?Ø¯."
+
+#: ../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 "Ø°Ø®Û?Ø±Ù? Ø¯Ø§Ø¦Ù?Û? Ø¨Ø§Ø² Ø´Ø¯. Ø¨Ø±Ø§Û? Ù?Ù?Ù? Ú©Ø±Ø¯Ù?, Tail Ù?Ø§ Ø±Ø§ Ø±Û? Ø§Ø³ØªØ§Ø±Øª Ú©Ù?Û?Ø¯"
+
+#: ../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 73e14c9b1..af97f3a51 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)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Silta & VÃ¤lityspalvelin"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Poissa verkosta"
-
-#: 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 "Poista lukitus"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "PysyvÃ¤n sÃ¤ilytystilan uudelleenlukitus epÃ¤onnistui."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
-msgstr "Avataan..."
-
-#: 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 "LisÃ¤asetukset"
 
-#: 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 "Peruuta"
 
-#: 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 "LisÃ¤Ã¤"
 
-#: 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 "Takaisin"
 
-#: 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 "_YllÃ¤pitosalasana"
+
+#: 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 "_Verkkoyhteys"
+
+#: 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 "Silta & VÃ¤lityspalvelin"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Poissa verkosta"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "PÃ¤Ã¤llÃ¤ (oletus)"
+
+#: 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 "Pois pÃ¤Ã¤ltÃ¤"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Pois pÃ¤Ã¤ltÃ¤ (oletus)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "Sammuta"
 
-#: 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 "_KÃ¤ynnistÃ¤ 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 ""
-
-#: 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"
@@ -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 "YllÃ¤pitosalasana"
-
-#: 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 "Luo yllÃ¤pitosalasana, jos sinun tarvitsee suorittaa yllÃ¤pitotehtÃ¤viÃ¤. Muussa tapauksessa yllÃ¤pitÃ¤jÃ¤n salasana on pois kÃ¤ytÃ¶stÃ¤ paremman tietoturvan vuoksi."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "SyÃ¶tÃ¤ yllÃ¤pitosalasana"
-
-#: 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 "Vahvista"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Vahvista yllÃ¤pitosalasanasi"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Poista kÃ¤ytÃ¶stÃ¤"
-
-#. 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-naamiointi"
-
-#. 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 "TÃ¤mÃ¤ saa Tailsin muistuttamaan Windows 10:tÃ¤, joka voi olla hyÃ¶dyllistÃ¤ julkisilla paikoilla huomion vÃ¤lttÃ¤miseksi."
-
-#. 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 -naamiointi"
-
-#: 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-osoitteen VÃ¤Ã¤rentÃ¤minen"
-
-#: 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/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 "Poista lukitus"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "VÃ¤Ã¤rennÃ¤ kaikki MAC-osoitteet (oletus)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "PysyvÃ¤n sÃ¤ilytystilan uudelleenlukitus epÃ¤onnistui."
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "Ã?lÃ¤ vÃ¤Ã¤rennÃ¤ MAC-osoitteita"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
+msgstr "Avataan..."
 
-#: 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."
+#: 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:531
-msgid "Welcome to Tails!"
-msgstr "Tervetuloa kÃ¤yttÃ¤mÃ¤Ã¤n Tailsia!"
-
-#. 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 "Paina yllÃ¤olevasta <b>KÃ¤y kiertueella</b>-linkistÃ¤ saadaksesi opastusta Tails'in asetuksista"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Kieli & Alue"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Oletusasetukset"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Tallenna kieli- ja alueasetukset"
-
-#: 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 "_Kieli"
 
-#: 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 "_NÃ¤ppÃ¤imistÃ¶n pohja"
 
-#: 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 "_AikavyÃ¶hyke"
-
-#: 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 "NÃ¤ytÃ¤ salasana"
-
-#: 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 "Lukitse pysyvÃ¤ sÃ¤ilytystila uudelleen"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "PysyvÃ¤ sÃ¤ilystilasi on auki. KÃ¤ynnistÃ¤ Tails uudelleen lukitaksesi se."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_LisÃ¤asetukset"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Tallenna lisÃ¤asetukset"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "LisÃ¤Ã¤ lisÃ¤asetus"
-
-#: 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 "Poista kaikki verkkoyhteydet kÃ¤ytÃ¶stÃ¤"
-
-#: 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 "_YllÃ¤pitosalasana"
-
-#: 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 "Pois pÃ¤Ã¤ltÃ¤ (oletus)"
-
-#: 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 "PÃ¤Ã¤llÃ¤ (oletus)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_Verkkoyhteys"
-
-#: 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 "Pois pÃ¤Ã¤ltÃ¤"
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -719,6 +533,11 @@ msgstr ""
 msgid "Password"
 msgstr "Salasana"
 
+#: 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 "Vahvista"
+
 #: 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 "Avaa sipulireititykset"
 
 #. 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 "Virhe aseman avauksessa"
 
 #. 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 "Aseman {volume_name} avaus epÃ¤onnistui: {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 ""
 
@@ -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 "YllÃ¤pitosalasana"
+
+#: ../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 "Luo yllÃ¤pitosalasana, jos sinun tarvitsee suorittaa yllÃ¤pitotehtÃ¤viÃ¤. Muussa tapauksessa yllÃ¤pitÃ¤jÃ¤n salasana on pois kÃ¤ytÃ¶stÃ¤ paremman tietoturvan vuoksi."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "SyÃ¶tÃ¤ yllÃ¤pitosalasana"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Vahvista yllÃ¤pitosalasanasi"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Poista kÃ¤ytÃ¶stÃ¤"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "MAC-osoitteen VÃ¤Ã¤rentÃ¤minen"
+
+#: ../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 "VÃ¤Ã¤rennÃ¤ kaikki MAC-osoitteet (oletus)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "Ã?lÃ¤ vÃ¤Ã¤rennÃ¤ MAC-osoitteita"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in: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 "Poista kaikki verkkoyhteydet kÃ¤ytÃ¶stÃ¤"
+
+#: ../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 "Tervetuloa kÃ¤yttÃ¤mÃ¤Ã¤n Tailsia!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Kieli & Alue"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Oletusasetukset"
+
+#: ../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 "Lukitse pysyvÃ¤ sÃ¤ilytystila uudelleen"
+
+#: ../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 "PysyvÃ¤ sÃ¤ilystilasi on auki. KÃ¤ynnistÃ¤ Tails uudelleen lukitaksesi se."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_LisÃ¤asetukset"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "LisÃ¤Ã¤ lisÃ¤asetus"
+
+#: ../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 "TiedostosÃ¤ilÃ¶t"
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 029022e41..b10f532e6 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 "_Start"
 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 "Annulearje"
+
+#: 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 "Annulearje"
+#: 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/ui/additional_settings.py:274
+msgid "Off"
 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:276
+msgid "Off (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "Ofslute"
 
-#: 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"
@@ -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 3a8df80aa..f63e4f279 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)"
-msgstr "DÃreach (rÃ©amhshocrÃº)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Droichead agus SeachfhreastalaÃ"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "As lÃne"
-
-#: 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ÃghlasÃ¡il"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "NÃorbh fhÃ©idir an stÃ³ras seasmhach a athghlasÃ¡il."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
-msgstr "Ã? dhÃghlasÃ¡il..."
-
-#: 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Ã fÃ©idir an stÃ³ras criptithe a dhÃghlasÃ¡il leis an bhfrÃ¡sa faire seo."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
 msgid "Additional Settings"
 msgstr "Socruithe Breise"
 
-#: 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 "Cealaigh"
 
-#: 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 "Nua"
 
-#: 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 "Siar"
 
-#: 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 "Foc_al Faire RiarachÃ¡in"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "BrÃ©agsheoltaÃ _MAC"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "Cea_ngal LÃonra"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "DÃreach (rÃ©amhshocrÃº)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Droichead agus SeachfhreastalaÃ"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "As lÃne"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "Ar siÃºl (rÃ©amhshocrÃº)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Ar siÃºl"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "MÃºchta"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "MÃºchta (rÃ©amhshocrÃº)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "MÃºch"
 
-#: 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 "To_saigh 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 "Theip ar live-persist leis an gcÃ³d {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"
@@ -178,7 +180,7 @@ msgid ""
 "{stderr}"
 msgstr "Theip ar cryptsetup leis an gcÃ³d {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"
@@ -186,7 +188,7 @@ msgid ""
 "{stderr}"
 msgstr "Theip ar live-persist leis an gcÃ³d {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"
@@ -194,225 +196,37 @@ msgid ""
 "{stderr}"
 msgstr "Theip ar umount leis an gcÃ³d {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 "Focal Faire RiarachÃ¡in"
-
-#: 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 "Is fiÃº focal faire riarachÃ¡in a shocrÃº mÃ¡s gÃ¡ duit tascanna riarachÃ¡in a chur i gcrÃch. Is Ã© sin, nÃ³ beidh an focal faire riarachÃ¡in dÃchumasaithe de bharr cÃºrsaÃ slÃ¡ndÃ¡la."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Cuir isteach focal faire riarachÃ¡in"
-
-#: 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 "Deimhnigh an focal faire riarachÃ¡in"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "DÃchumasaigh"
-
-#. 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 Camouflage"
-
-#. 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 "Cuireann an rogha seo cuma Microsoft Windows 10 ar Tails. TÃ¡ sÃ© seo ÃºsÃ¡ideach nuair nach bhfuil tÃº ag iarraidh amhras a mhÃºscailt in Ã¡it phoiblÃ."
-
-#. 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 camouflage"
-
-#: 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 "BrÃ©agsheoltaÃ 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 "Cuireann brÃ©agsheoladh MAC sraithuimhir do chomhÃ©adain lÃonra (Wi-Fi nÃ³ sreangaithe) i bhfolach. Go hiondÃºil tÃ¡ sÃ© nÃos sÃ¡bhÃ¡ilte brÃ©agsheoladh MAC a ÃºsÃ¡id toisc go gcabhraÃonn sÃ© leat do shuÃomh geografach a cheilt. Ach, uaireanta is cÃºis le fadhbanna lÃonra Ã©, agus tÃ¡ cuma amhrasach air freisin."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Ã?sÃ¡id brÃ©agsheoltaÃ MAC i gcÃ³naÃ (rÃ©amhshocrÃº)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "NÃ¡ hÃºsÃ¡id brÃ©agsheoltaÃ MAC riamh"
-
-#: 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 "CumrÃ³idh tÃº an droichead Tor agus an seachfhreastalaÃ Ã¡itiÃºil ar ball, tar Ã©is duit ceangal a bhunÃº le lÃonra."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "FÃ¡ilte go 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 "Chun turas treoraithe a dhÃ©anamh trÃ shocruithe Tails, cliceÃ¡il <b>DÃ©an Turas</b> thuas"
+#: 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ÃghlasÃ¡il"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Teanga agus RÃ©igiÃºn"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "NÃorbh fhÃ©idir an stÃ³ras seasmhach a athghlasÃ¡il."
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "RÃ©amhshocruithe"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
+msgstr "Ã? dhÃghlasÃ¡il..."
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "SÃ¡bhÃ¡il Socruithe Teanga agus RÃ©igiÃºin"
+#: 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Ã fÃ©idir an stÃ³ras criptithe a dhÃghlasÃ¡il leis an bhfrÃ¡sa faire seo."
 
-#: 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 "_Teanga"
 
-#: 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 "_Leagan Amach an MhÃ©archlÃ¡ir"
 
-#: 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 "_FormÃ¡idÃ"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Crios Ama"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "StÃ³ras _Seasmhach Criptithe"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "TaispeÃ¡in an FrÃ¡sa Faire"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "CumraÃocht an StÃ³rais Sheasmhaigh"
-
-#. 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 "Cuir isteach an frÃ¡sa faire chun an stÃ³ras seasmhach a dhÃghlasÃ¡il"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "AthghlasÃ¡il an StÃ³ras Seasmhach"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "TÃ¡ an stÃ³ras seasmhach dÃghlasÃ¡ilte. Atosaigh Tails lena chur faoi ghlas arÃs."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_Socruithe Breise"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "SÃ¡bhÃ¡il Socruithe Breise"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Cuir socrÃº breise leis"
-
-#: 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 "CumraÃocht LÃonra"
-
-#: 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 "MÃ¡ dhÃ©antar cinsireacht nÃ³ scagadh ar do cheangal IdirlÃn, nÃ³ mÃ¡ ÃºsÃ¡ideann sÃ© seachfhreastalaÃ, is fÃ©idir leat droichead Tor nÃ³ seachfhreastalaÃ Ã¡itiÃºil a shocrÃº. NÃ³, is fÃ©idir leat an lÃonra a mhÃºchadh go huile is go hiomlÃ¡n agus do chuid oibre a dhÃ©anamh as lÃne."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Ceangal dÃreach le lÃonra Tor (rÃ©amhshocrÃº)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Cumraigh droichead Tor nÃ³ seachfhreastalaÃ Ã¡itiÃºil"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "DÃchumasaigh an lÃonra go hiomlÃ¡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 "TÃ¡ na rÃ©amhshocruithe slÃ¡n an chuid is mÃ³ den am. BrÃºigh an cnaipe \"+\" thÃos le do shocrÃº fÃ©in a chur leis."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "Foc_al Faire RiarachÃ¡in"
-
-#: 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 "MÃºchta (rÃ©amhshocrÃº)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "BrÃ©agsheoltaÃ _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 "Ar siÃºl (rÃ©amhshocrÃº)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "Cea_ngal LÃonra"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Windows Camouflage"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Ar siÃºl"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "MÃºchta"
-
 #: 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 "Focal Faire RiarachÃ¡in"
+
+#: ../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 "Is fiÃº focal faire riarachÃ¡in a shocrÃº mÃ¡s gÃ¡ duit tascanna riarachÃ¡in a chur i gcrÃch. Is Ã© sin, nÃ³ beidh an focal faire riarachÃ¡in dÃchumasaithe de bharr cÃºrsaÃ slÃ¡ndÃ¡la."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Cuir isteach focal faire riarachÃ¡in"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Deimhnigh an focal faire riarachÃ¡in"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "DÃchumasaigh"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "BrÃ©agsheoltaÃ 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 "Cuireann brÃ©agsheoladh MAC sraithuimhir do chomhÃ©adain lÃonra (Wi-Fi nÃ³ sreangaithe) i bhfolach. Go hiondÃºil tÃ¡ sÃ© nÃos sÃ¡bhÃ¡ilte brÃ©agsheoladh MAC a ÃºsÃ¡id toisc go gcabhraÃonn sÃ© leat do shuÃomh geografach a cheilt. Ach, uaireanta is cÃºis le fadhbanna lÃonra Ã©, agus tÃ¡ cuma amhrasach air freisin."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Ã?sÃ¡id brÃ©agsheoltaÃ MAC i gcÃ³naÃ (rÃ©amhshocrÃº)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "NÃ¡ hÃºsÃ¡id brÃ©agsheoltaÃ MAC riamh"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "CumraÃocht LÃonra"
+
+#: ../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 "MÃ¡ dhÃ©antar cinsireacht nÃ³ scagadh ar do cheangal IdirlÃn, nÃ³ mÃ¡ ÃºsÃ¡ideann sÃ© seachfhreastalaÃ, is fÃ©idir leat droichead Tor nÃ³ seachfhreastalaÃ Ã¡itiÃºil a shocrÃº. NÃ³, is fÃ©idir leat an lÃonra a mhÃºchadh go huile is go hiomlÃ¡n agus do chuid oibre a dhÃ©anamh as lÃne."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Ceangal dÃreach le lÃonra Tor (rÃ©amhshocrÃº)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Cumraigh droichead Tor nÃ³ seachfhreastalaÃ Ã¡itiÃºil"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "DÃchumasaigh an lÃonra go hiomlÃ¡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 "CumrÃ³idh tÃº an droichead Tor agus an seachfhreastalaÃ Ã¡itiÃºil ar ball, tar Ã©is duit ceangal a bhunÃº le lÃonra."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "FÃ¡ilte go Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Teanga agus RÃ©igiÃºn"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "RÃ©amhshocruithe"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "StÃ³ras _Seasmhach Criptithe"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "CumraÃocht an StÃ³rais Sheasmhaigh"
+
+#. The label 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 "Cuir isteach an frÃ¡sa faire chun an stÃ³ras seasmhach a dhÃghlasÃ¡il"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "AthghlasÃ¡il an StÃ³ras Seasmhach"
+
+#: ../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 "TÃ¡ an stÃ³ras seasmhach dÃghlasÃ¡ilte. Atosaigh Tails lena chur faoi ghlas arÃs."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_Socruithe Breise"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Cuir socrÃº breise leis"
+
+#: ../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 "TÃ¡ na rÃ©amhshocruithe slÃ¡n an chuid is mÃ³ den am. BrÃºigh an cnaipe \"+\" thÃos le do shocrÃº fÃ©in a chur leis."
+
 #: ../config/chroot_local-includes/usr/share/tails/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 591bc9ff5..a0bc30288 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 "_Iniciar"
 msgid "_Exit"
 msgstr "_SaÃr"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
+#: 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/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 "Engadir"
+
+#: 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/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr ""
+
+#: 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/gui.py:392
+#: 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:398
+#: 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/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."
+#: 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: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."
+#: 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:595
-msgid "Additional Settings"
+#: 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: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/gui.py:609
-msgid "Add"
-msgstr "Engadir"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
-msgstr "Anterior"
+#: 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/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: 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"
@@ -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 "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 "Desactivar"
-
-#. 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 "Camuflaxe de 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 ""
-
-#. 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"
-msgstr ""
+#: 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"
+#: 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 "Axustes por defecto"
+#: 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"
+#: 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 "Deshabilitar toda conexiÃ³n Ã¡ 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 ""
-
-#: 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 "Contrasinal"
 
+#: 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 ten os seguintes problemas de seguridade coÃ±ecidos:"
@@ -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 "Desactivar"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in: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 "Deshabilitar toda conexiÃ³n Ã¡ 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 ""
+
+#: ../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 "Axustes por defecto"
+
+#: ../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 29ca82423..bd4e7effb 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)"
-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 ""
+
+#: 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 ""
+
+#: 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 ""
 
-#. 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 "àª®à«?àª³àªà«?àª¤: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 ""
 
-#: 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 "Microsoft Windows 10 camouflage"
-
-#: 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 Address àª¸à«?àªªà«?àª«àª¿àª?àª?"
-
-#: 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/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:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
+#: 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:531
-msgid "Welcome to Tails!"
-msgstr "Tails àªªàª° àª?àªªàª¨à«?àª? àª¸à«?àªµàª¾àª?àª¤ àª?à«?!"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
+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: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:581
-msgid "Language & Region"
-msgstr "àªàª¾àª·àª¾ àª?àª¨à«? àªªà«?àª°àª¦à«?àª¶"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "àª®à«?àª³àªà«?àª¤ àª¸à«?àª?àª¿àª?àª?à«?àª¸"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-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 "_Language"
 
-#: 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 "_Keyboard Layout"
 
-#: 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 "_Time Zone"
-
-#: 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 "MAC Address àª¸à«?àªªà«?àª«àª¿àª?àª?"
+
+#: ../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 "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 "àª?àª¨àª?à«?àª°àª¿àªªà«?àª? àª¥àª¯à«?àª² àª¸àª¤àª¤ àª¸àª?àª?à«?àª°àª¹"
+
+#: ../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 e0e9072a8..2a61cc5c1 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)"
-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 "_×¡×?×¡×?×ª ×?×?× ×?×?"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_×?×?×?×£ ×?×ª×?×?×ª MAC"
+
+#: 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 "×?×©×¨ ×?×?×?×¤×?×?Ö¾×?×?×?"
+
+#: 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"
 
-#. 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 × ×?×©×? ×¢×? ×?×?×¨×? {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"
@@ -183,7 +185,7 @@ msgid ""
 "{stderr}"
 msgstr "cryptsetup × ×?×©×? ×¢×? ×§×?×? ×?×?×¨×? {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"
@@ -191,7 +193,7 @@ msgid ""
 "{stderr}"
 msgstr "live-persist × ×?×©×? ×¢×? ×§×?×? ×?×?×¨×? {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"
@@ -199,225 +201,37 @@ msgid ""
 "{stderr}"
 msgstr "umount × ×?×©×? ×¢×? ×§×?×? ×?×?×¨×? {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 "_×©×¤×?"
 
-#: 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 "×?×?×?×¡×?×? ×?×?×ª×?×?×? ×©×?×? ×?×?× ×? × ×¢×?×?. ×?×¤×¢×? ×?×?×?×© ×?×ª Tails ×?×?×? ×?× ×¢×?×? ×?×?×ª×? ×©×?×?."
-
-#: 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 "×?×? ×?×?×?×?×¨ ×?×?×?× ×?×¨× ×? ×©×?×? ×?×¦×?× ×?×¨, ×?×¡×?× ×? ×?×? ×¢×?×?×¨ ×?×¨×? ×?×?×¤×?×?Ö¾×?×?×?, ×?×ª×? ×?×?×?×? ×?×ª×¦×¨ ×?×©×¨ 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 "_×¡×?×¡×?×ª ×?×?× ×?×?"
-
-#: 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"
-
-#: 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 "_×?×¡×?×?×?×ª Windows"
-
-#: 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 "{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 "{partition_name} ×? {container_path}"
@@ -849,14 +668,14 @@ msgstr "{partition_name} ×? {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} ×¢×? {drive_name}"
@@ -865,42 +684,42 @@ msgstr "{partition_name} ×¢×? {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 "×?×?×?×?×? ×¡×?×¡×?×? ×©×?×?×? ×?×? ×¤×¨×?×?×¨×?×? ×©×?×?×?×?×?"
 
-#: 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 "× ×¢×?×?×ª ×?×?×¨×? × ×?×©×?×?"
 
@@ -1098,6 +917,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 "×?×?×¡×?×? _×?×ª×?×?×? ×?×?×¦×¤×?"
+
+#: ../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 "×?×?×?×¨×?×ª _× ×?×¡×¤×?×ª"
+
+#: ../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 63a33b8ff..2fe518385 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)"
-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 ""
+
+#: 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 ""
+
+#: 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 "Shutdown"
 
-#: 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"
@@ -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 ""
+#: 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 "à¤?à¤¨à¤²à¥?à¤?"
 
-#. 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:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-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 "_à¤à¤¾à¤·à¤¾"
 
-#: 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 478013a49..09f73d4e3 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 "_Pokreni"
 msgid "_Exit"
 msgstr "_Izlaz"
 
-#: 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 "Direktno (zadano)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Most i 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 "OtkljuÄ?aj"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Nije uspjelo zakljuÄ?avanje trajne pohrane."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
-msgstr "OtkljuÄ?avam..."
-
-#: 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 "Ne mogu otkljuÄ?ati enkriptiranu pohranu s ovom lozinkom."
-
-#: 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 "Dodatne postavke"
 
-#: 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 "Cancel"
 
-#: 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 "Dodaj"
 
-#: 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 "Povratak"
 
-#: 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 "_Administratorska lozinka"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_Maskiranje MAC adrese"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_MreÅ¾na veza"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Direktno (zadano)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Most i 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 "UkljuÄ?eno (zadano)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "UkljuÄ?eno"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "IskljuÄ?eno"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "IskljuÄ?eno (zadano)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "GaÅ¡enje"
 
-#: 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 "_Pokreni 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 "zadano: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 nije uspio s povratnim kodom {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"
@@ -177,7 +179,7 @@ msgid ""
 "{stderr}"
 msgstr "cryptsetup nije uspio s povratnim kodom {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"
@@ -185,7 +187,7 @@ msgid ""
 "{stderr}"
 msgstr "trajna pohrana nije vratila kod {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"
@@ -193,225 +195,37 @@ msgid ""
 "{stderr}"
 msgstr "Umount nije uspio s povratnim kodom {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 "Administratorska lozinka"
-
-#: 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 "Postavite administratorsku lozinku ako trebate izvoditi administratorske zadatke. U suprotnom, administratorska lozinka Ä?e biti onemoguÄ?ena zbog bolje sigurnosti."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Unesite administratorsku lozinku"
-
-#: 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 "Potvrdi"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Potvrdite svoju administratorsku lozinku"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "OnemoguÄ?i"
-
-#. 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 maskiranje"
-
-#. 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 "Ova opcija maskira Tails u Windows 10. To moÅ¾e biti korisno za izbjegavanje pozornosti na javnim mjestima."
-
-#. 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 kamuflaÅ¾a"
-
-#: 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 "Maskiranje MAC adrese"
-
-#: 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 "Maskiranje MAC adrese krije serijski broj VaÅ¡eg mreÅ¾nog suÄ?elja (Wi-Fi ili Å¾iÄ?anog adaptera) na lokalnu mreÅ¾u. Maskiranje MAC adrese je generalno sigurnije jer Vam pomaÅ¾e da sakrijete svoju geografsku lokaciju, ali moÅ¾e stvoriti probleme sa vezom ili izazvati sumnju."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Maskiraj sve MAC adrese (zadano)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "Ne maskiraj MAC adrese"
-
-#: 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 "Konfigurirat Ä?e te Tor most i lokalni proxy kasnije, nakon spajanja na mreÅ¾u."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "DobrodoÅ¡li u 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 "Da bi Vas proveli kroz Tails postavke, kliknite na <b>Obilazak</b> iznad"
+#: 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 "OtkljuÄ?aj"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Jezik i regija"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Nije uspjelo zakljuÄ?avanje trajne pohrane."
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Zadane postavke"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
+msgstr "OtkljuÄ?avam..."
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Spremite postavke jezika i regije"
+#: 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 "Ne mogu otkljuÄ?ati enkriptiranu pohranu s ovom lozinkom."
 
-#: 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 "_Jezik"
 
-#: 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 "_Raspored tipkovnice"
 
-#: 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 "_Formati"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Vremenska zona"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Enkriptirana _Trajna pohrana"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "PokaÅ¾i lozinku"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Postavi trajnu pohranu"
-
-#. 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 "Unesite lozinku za otkljuÄ?avanje trajne pohrane"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "ZakljuÄ?aj trajnu pohranu"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "VaÅ¡a trajna pohrana je otkljuÄ?ana. Ponovno pokrenite Tails kako bi ju opet zakljuÄ?ali."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_Dodatne postavke"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Spremi dodatne postavke"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Dodaj dodatne postavke"
-
-#: 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 "MreÅ¾na konfiguracija"
-
-#: 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 "Ako je VaÅ¡a Internet veza cenzurirana, filtrirana ili iza proxya, moÅ¾ete konfigurirati Tor most ili lokalni proxy.  Kako bi radili kompletno offline, moÅ¾ete onemoguÄ?iti sve mreÅ¾ne radnje."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Spoji se izravno na Tor mreÅ¾u (zadano)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Konfigurirajte Tor most ili lokalni proxy"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "OnemoguÄ?i sav mreÅ¾ni rad"
-
-#: 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 "Zadane postavke su sigurne u veÄ?ini situacija. Kako bi dodali prilagoÄ?ene postavke, stisnite \"+\" gumb."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Administratorska lozinka"
-
-#: 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 "IskljuÄ?eno (zadano)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_Maskiranje MAC adrese"
-
-#: 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 "UkljuÄ?eno (zadano)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_MreÅ¾na veza"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Windows kamuflaÅ¾a"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "UkljuÄ?eno"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "IskljuÄ?eno"
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -710,6 +524,11 @@ msgstr ""
 msgid "Password"
 msgstr "Lozinka"
 
+#: 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 "Potvrdi"
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr "Ova verzija Tailsa ima poznate sigurnosne probleme:"
@@ -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 "Administratorska lozinka"
+
+#: ../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 "Postavite administratorsku lozinku ako trebate izvoditi administratorske zadatke. U suprotnom, administratorska lozinka Ä?e biti onemoguÄ?ena zbog bolje sigurnosti."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Unesite administratorsku lozinku"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Potvrdite svoju administratorsku lozinku"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "OnemoguÄ?i"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "Maskiranje MAC adrese"
+
+#: ../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 "Maskiranje MAC adrese krije serijski broj VaÅ¡eg mreÅ¾nog suÄ?elja (Wi-Fi ili Å¾iÄ?anog adaptera) na lokalnu mreÅ¾u. Maskiranje MAC adrese je generalno sigurnije jer Vam pomaÅ¾e da sakrijete svoju geografsku lokaciju, ali moÅ¾e stvoriti probleme sa vezom ili izazvati sumnju."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Maskiraj sve MAC adrese (zadano)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "Ne maskiraj MAC adrese"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "MreÅ¾na konfiguracija"
+
+#: ../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 "Ako je VaÅ¡a Internet veza cenzurirana, filtrirana ili iza proxya, moÅ¾ete konfigurirati Tor most ili lokalni proxy.  Kako bi radili kompletno offline, moÅ¾ete onemoguÄ?iti sve mreÅ¾ne radnje."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Spoji se izravno na Tor mreÅ¾u (zadano)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Konfigurirajte Tor most ili lokalni proxy"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "OnemoguÄ?i sav mreÅ¾ni rad"
+
+#: ../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 "Konfigurirat Ä?e te Tor most i lokalni proxy kasnije, nakon spajanja na mreÅ¾u."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "DobrodoÅ¡li u Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Jezik i regija"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Zadane postavke"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Enkriptirana _Trajna pohrana"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Postavi trajnu pohranu"
+
+#. The label 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 "Unesite lozinku za otkljuÄ?avanje trajne pohrane"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "ZakljuÄ?aj trajnu pohranu"
+
+#: ../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 "VaÅ¡a trajna pohrana je otkljuÄ?ana. Ponovno pokrenite Tails kako bi ju opet zakljuÄ?ali."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_Dodatne postavke"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Dodaj dodatne postavke"
+
+#: ../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 "Zadane postavke su sigurne u veÄ?ini situacija. Kako bi dodali prilagoÄ?ene postavke, stisnite \"+\" gumb."
+
 #: ../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 02f597551..50db9236a 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)"
-msgstr "KÃ¶zvetlen (alapÃ©rtelmezett)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "HÃd Ã©s 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 "FeloldÃ¡s"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Sikertelen a tartÃ³stÃ¡r vissza zÃ¡rÃ¡sa."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
-msgstr "FeloldÃ¡s..."
-
-#: 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 "A titkosÃtott tÃ¡rolÃ³ nem dekÃ³dolhatÃ³ ezzel a jelszÃ³val."
-
-#: 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 "TovÃ¡bbi beÃ¡llÃtÃ¡sok"
 
-#: 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 "MÃ©gse"
 
-#: 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 "HozzÃ¡ad"
 
-#: 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 "Vissza"
 
-#: 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 "_AdminisztrÃ¡ciÃ³s jelszÃ³"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_MAC cÃm hamisÃtÃ¡s"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_HÃ¡lÃ³zati kapcsolat"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "KÃ¶zvetlen (alapÃ©rtelmezett)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "HÃd Ã©s 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 "Be (alapÃ©rtelmezett)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Be"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Ki"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Ki (alapÃ©rtelmezett)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "LeÃ¡llÃtÃ¡s"
 
-#: 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 indÃtÃ¡sa"
 
-#. 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 failed with return code {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"
@@ -185,7 +187,7 @@ msgid ""
 "{stderr}"
 msgstr "cryptsetup failed with return code {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"
@@ -193,7 +195,7 @@ msgid ""
 "{stderr}"
 msgstr "live-persist failed with return code {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"
@@ -201,225 +203,37 @@ msgid ""
 "{stderr}"
 msgstr "umount failed with return code {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 "AdminisztrÃ¡tori jelszÃ³"
-
-#: 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 "Ã?llÃtson be egy adminisztrÃ¡tori jelszÃ³t, ha szÃ¼ksÃ©ges  adminisztrÃ¡ciÃ³s feladatokat vÃ©gezni. EgyÃ©bkÃ©nt az adminisztrÃ¡tori jelszÃ³ tiltott a magasabb biztonsÃ¡g Ã©rdekÃ©ben."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Adjon meg egy adminisztrÃ¡tori jelszÃ³t"
-
-#: 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 "ErÅ?sÃtse meg adminisztrÃ¡ciÃ³s jelszavÃ¡t"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Kikapcsol"
-
-#. 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 Ã¡lcÃ¡zÃ¡s"
-
-#. 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 "Ez az opciÃ³ a Tails-t olyannÃ¡ alakÃtja, hogy hasonltÃson a Microsoft Windows 10-hez. Ez hasznos lehet annak elkerÃ¼lÃ©sÃ©re, hogy publikus helyen felfigyeljenek Ã?nre."
-
-#. 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 Ã¡lca"
-
-#: 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 cÃm hamisÃtÃ¡s"
-
-#: 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 MAC cÃm hamisÃtÃ¡s elrejti a sorozatszÃ¡mÃ¡t a hÃ¡lÃ³zati interfÃ©szÃ©nek (Wi-Fi vagy vezetÃ©kes) a helyi hÃ¡lÃ³zaton.\nA MAC cÃm hamisÃtÃ¡sa Ã¡ltalÃ¡ban biztonsÃ¡gosabb, mert segÃt abban,hogy elrejts fÃ¶ldrajzi helyzetÃ©t. Azonban elÅ?fordulhat, hogy kapcsolati problÃ©mÃ¡kat okozhat, vagy gyanÃºsnak tÅ±nik."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Minden MAC cÃm hamisÃtÃ¡sa (alapÃ©rtelmezett)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "Ne hamisÃtsa a MAC cÃmeket"
-
-#: 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 "A Tor hidat Ã©s a helyi proxy-t kÃ©sÅ?bb tudja beÃ¡llÃtani, miutÃ¡n csatlakozott a hÃ¡lÃ³zatra."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "KÃ¶szÃ¶ntjÃ¼k a Tails-ben!"
-
-#. 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 "Hogy eligazodjon a Tails beÃ¡llÃtÃ¡sai kÃ¶zÃ¶tt, kattintson a <b>Tegyen egy tÃºrÃ¡t</b> gombra felÃ¼l"
+#: 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 "FeloldÃ¡s"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Nyelv Ã©s rÃ©giÃ³"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Sikertelen a tartÃ³stÃ¡r vissza zÃ¡rÃ¡sa."
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "AlapbeÃ¡llÃtÃ¡sok"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
+msgstr "FeloldÃ¡s..."
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Nyelvi Ã©s rÃ©giÃ³s beÃ¡llÃtÃ¡sok mentÃ©se"
+#: 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 "A titkosÃtott tÃ¡rolÃ³ nem dekÃ³dolhatÃ³ ezzel a jelszÃ³val."
 
-#: 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 "_Nyelv"
 
-#: 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 "_BillentyÅ±zet kiosztÃ¡s"
 
-#: 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 "_FormÃ¡tumok"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_IdÅ?zÃ³na"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "TitkosÃtott _TartÃ³s tÃ¡r"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Jelmondat megjelenÃtÃ©se"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "TartÃ³stÃ¡r beÃ¡llÃtÃ¡sa"
-
-#. 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 "Adja meg a jelszavÃ¡t a tartÃ³stÃ¡r feloldÃ¡sÃ¡hoz"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "TartÃ³stÃ¡r vissza zÃ¡rÃ¡sa"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "A tartÃ³s tÃ¡ra nyitva. IndÃtsa Ãºjra a Tails-t a visszazÃ¡rÃ¡sÃ¡hoz."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_TovÃ¡bbi beÃ¡llÃtÃ¡sok"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "TovÃ¡bbi beÃ¡llÃtÃ¡sok mentÃ©se"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "TovÃ¡bb beÃ¡llÃtÃ¡sok hozzÃ¡ adÃ¡sa"
-
-#: 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 "HÃ¡lÃ³zati konfigurÃ¡ciÃ³"
-
-#: 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 "Ha az internet csatlakozÃ¡s cenzorÃ¡lt, szÅ±rt vagy proxyzot, akkor Tor hidat vagy lokÃ¡lis proxyt Ã¡llÃthat be. A teljesen offline munkÃ¡hoz kapcsolja ki az Ã¶sszes hÃ¡lÃ³zatot."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "CsatlakozÃ¡s kÃ¶zvetlenÃ¼l a Tor hÃ¡lÃ³zathoz (alapÃ©rtelmezett)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Tor hÃd vagy helyi proxy beÃ¡llÃtÃ¡sa"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Ã?sszes hÃ¡lÃ³zatÃ©pÃtÃ©s letiltÃ¡sa"
-
-#: 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 "Az alapÃ©rtelmezett beÃ¡llÃtÃ¡sok biztonsÃ¡gosak a legtÃ¶bb helyzetben. Az egyÃ©ni beÃ¡llÃtÃ¡sok hozzÃ¡adÃ¡sÃ¡hoz nyomja meg a \"+\" gombot alÃ¡bb."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_AdminisztrÃ¡ciÃ³s jelszÃ³"
-
-#: 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 "Ki (alapÃ©rtelmezett)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_MAC cÃm hamisÃtÃ¡s"
-
-#: 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 "Be (alapÃ©rtelmezett)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_HÃ¡lÃ³zati kapcsolat"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Windows Ã¡lcÃ¡zÃ¡s"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Be"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Ki"
-
 #: 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 "AdminisztrÃ¡tori jelszÃ³"
+
+#: ../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 "Ã?llÃtson be egy adminisztrÃ¡tori jelszÃ³t, ha szÃ¼ksÃ©ges  adminisztrÃ¡ciÃ³s feladatokat vÃ©gezni. EgyÃ©bkÃ©nt az adminisztrÃ¡tori jelszÃ³ tiltott a magasabb biztonsÃ¡g Ã©rdekÃ©ben."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Adjon meg egy adminisztrÃ¡tori jelszÃ³t"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "ErÅ?sÃtse meg adminisztrÃ¡ciÃ³s jelszavÃ¡t"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Kikapcsol"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "MAC cÃm hamisÃtÃ¡s"
+
+#: ../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 MAC cÃm hamisÃtÃ¡s elrejti a sorozatszÃ¡mÃ¡t a hÃ¡lÃ³zati interfÃ©szÃ©nek (Wi-Fi vagy vezetÃ©kes) a helyi hÃ¡lÃ³zaton.\nA MAC cÃm hamisÃtÃ¡sa Ã¡ltalÃ¡ban biztonsÃ¡gosabb, mert segÃt abban,hogy elrejts fÃ¶ldrajzi helyzetÃ©t. Azonban elÅ?fordulhat, hogy kapcsolati problÃ©mÃ¡kat okozhat, vagy gyanÃºsnak tÅ±nik."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Minden MAC cÃm hamisÃtÃ¡sa (alapÃ©rtelmezett)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "Ne hamisÃtsa a MAC cÃmeket"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "HÃ¡lÃ³zati konfigurÃ¡ciÃ³"
+
+#: ../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 "Ha az internet csatlakozÃ¡s cenzorÃ¡lt, szÅ±rt vagy proxyzot, akkor Tor hidat vagy lokÃ¡lis proxyt Ã¡llÃthat be. A teljesen offline munkÃ¡hoz kapcsolja ki az Ã¶sszes hÃ¡lÃ³zatot."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "CsatlakozÃ¡s kÃ¶zvetlenÃ¼l a Tor hÃ¡lÃ³zathoz (alapÃ©rtelmezett)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Tor hÃd vagy helyi proxy beÃ¡llÃtÃ¡sa"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Ã?sszes hÃ¡lÃ³zatÃ©pÃtÃ©s letiltÃ¡sa"
+
+#: ../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 "A Tor hidat Ã©s a helyi proxy-t kÃ©sÅ?bb tudja beÃ¡llÃtani, miutÃ¡n csatlakozott a hÃ¡lÃ³zatra."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "KÃ¶szÃ¶ntjÃ¼k a Tails-ben!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Nyelv Ã©s rÃ©giÃ³"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "AlapbeÃ¡llÃtÃ¡sok"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "TitkosÃtott _TartÃ³s tÃ¡r"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "TartÃ³stÃ¡r beÃ¡llÃtÃ¡sa"
+
+#. The label 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 "Adja meg a jelszavÃ¡t a tartÃ³stÃ¡r feloldÃ¡sÃ¡hoz"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "TartÃ³stÃ¡r vissza zÃ¡rÃ¡sa"
+
+#: ../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 "A tartÃ³s tÃ¡ra nyitva. IndÃtsa Ãºjra a Tails-t a visszazÃ¡rÃ¡sÃ¡hoz."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_TovÃ¡bbi beÃ¡llÃtÃ¡sok"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "TovÃ¡bb beÃ¡llÃtÃ¡sok hozzÃ¡ adÃ¡sa"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "Az alapÃ©rtelmezett beÃ¡llÃtÃ¡sok biztonsÃ¡gosak a legtÃ¶bb helyzetben. Az egyÃ©ni beÃ¡llÃtÃ¡sok hozzÃ¡adÃ¡sÃ¡hoz nyomja meg a \"+\" gombot alÃ¡bb."
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "FÃ¡jl kontÃ©nerek"
diff --git a/hy.po b/hy.po
index 09a5794ad..3db3bc0fc 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/ui/add_settings_dialog.py:46
+msgid "Add"
+msgstr "Ô±Õ¾Õ¥Õ¬Õ¡Ö?Õ¶Õ¥Õ¬"
+
+#: 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/ui/additional_settings.py:56
+msgid "_Administration Password"
 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/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 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:206
+msgid "_Network Connection"
 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:215
+msgid "Direct (default)"
 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:217
+msgid "Bridge & Proxy"
 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:219
+msgid "Offline"
 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:270
+msgid "On (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"
-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/gui.py:609
-msgid "Add"
-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/gui.py:617
-msgid "Back"
-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/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: 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"
@@ -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 4ff3af0c9..3ef1d2cc1 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)"
-msgstr "Langsung (default)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Bridge & Proxy "
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Luring"
-
-#: 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 "Tidak terkunci"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Gagal mengunci kembali penyimpanan menetap"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
-msgstr "Membuka kunci..."
-
-#: 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 "Tidak dapat membuka penyimpanan terenkripsi dengan frasa sandi ini."
-
-#: 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 "Pengaturan Tambahan"
 
-#: 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 "Batal"
 
-#: 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 "Tambah"
 
-#: 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 "Kembali"
 
-#: 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 "_Password Admin"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_Pemalsuan alamat MAC"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_Koneksi Jaringan"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Langsung (default)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Bridge & Proxy "
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Luring"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "Aktif (default)"
+
+#: 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 "Nonaktif (default)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "Matikan"
 
-#: 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 "_Mulai 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 gagal dengan kode {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"
@@ -189,7 +191,7 @@ msgid ""
 "{stderr}"
 msgstr "cryptsetup gagal dengan kode {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"
@@ -197,7 +199,7 @@ msgid ""
 "{stderr}"
 msgstr "live-persist gagal dengan kode {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"
@@ -205,225 +207,37 @@ msgid ""
 "{stderr}"
 msgstr "umount gagal dengan kode {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 "Password Admin"
-
-#: 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 "Buat sandi administrasi Anda jika Anda perlu menjalankan tugas administrasi. Jika tidak, sandi administrasi dinonaktifkan untuk keamanan yang lebih baik."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Masukkan password admin"
-
-#: 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 "Konfirmasi"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Konfirmasi password admin anda"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Matikan"
-
-#. 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 "Kamuflase Jendela"
-
-#. 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 "Opsi ini membuat Tails terlihat lebih seperti Microsoft Windows 10. Hal ini dapat berguna untuk menghindari kecurigaan di tempat umum."
-
-#. 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 "Kamuflase 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 "Pemalsuan alamat 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 "Pemalsuan alamat MAC menyembunyikan nomor serial kartu jaringan Anda (Wi-fi atau kabel) ke jaringan lokal. Memasulkan alamat MAC biasanya lebih aman karena menyembunyikan lokasi geografis anda. Tapi itu mungkin juga membuat masalah konektivitas atau menimbulkan kecurigaan."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Palsukan semua alamat MAC (default)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "Jangan palsukan alamat 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 "Anda akan mengatur jembatan Tor dan proxy lokal nanti setelah terhubung ke jaringan."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Selamat datang di 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 "Untuk panduin di pengaturan Tails, klik pada <b>Ambil tur</b> di atas"
+#: 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 "Tidak terkunci"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Bahasa & Wilayah"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Gagal mengunci kembali penyimpanan menetap"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Pengaturan Default"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
+msgstr "Membuka kunci..."
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Simpan bahasa & pengaturan wilayah"
+#: 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 "Tidak dapat membuka penyimpanan terenkripsi dengan frasa sandi ini."
 
-#: 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 "_Bahasa"
 
-#: 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 "_Tata Letak Keyboard"
 
-#: 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 "_Format"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Zona Waktu"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "_Penyimpanan Menetap Terenkripsi"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Tampilkan Kata Kunci"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Konfigurasi Penyimpanan Menetap"
-
-#. 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 "Masukkan kata kunci untuk memprotect volume persistent"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Kunci Kembali Penyimpanan Menetap"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "Penyimpanan Menetap Anda tidak terkunci. Memulai kembali Tails untuk menguncinya lagi."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_Pengaturan Tambahan"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Simpan Pengaturan Tambahan"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Tambah pengaturan tambahan"
-
-#: 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 "Konfigurasi Jaringan"
-
-#: 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 "Jika koneksi Internet Anda tersensor, tersaring atau terproxy, Anda dapat mengatur sebuah Tor bridge atau proxy lokal. Untuk sepenuhnya offline, Anda dapat menonaktifkan semua jaringan"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Tersambung langsung ke Jaringan Tor (default)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Atur Tor bridge atau proxy lokal"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Nonaktifkan semua jaringan"
-
-#: 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 "Pengaturan default aman untuk banyak situasi. Untuk menambah pengaturan tambahan, tekan tombol \"+\" di bawah."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Password Admin"
-
-#: 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 "Nonaktif (default)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_Pemalsuan alamat 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 "Aktif (default)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_Koneksi Jaringan"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Kamuflase Windows"
-
-#: 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 "Buat kata sandi untuk membuka kunci layar."
 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 "Konfirmasi"
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr "Versi Tails ini telah mengetahui isu-isu keamanan:"
@@ -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 "{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 ""
@@ -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 "{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 ""
 
-#: 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 "Password Admin"
+
+#: ../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 "Buat sandi administrasi Anda jika Anda perlu menjalankan tugas administrasi. Jika tidak, sandi administrasi dinonaktifkan untuk keamanan yang lebih baik."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Masukkan password admin"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Konfirmasi password admin anda"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Matikan"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "Pemalsuan alamat 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 "Pemalsuan alamat MAC menyembunyikan nomor serial kartu jaringan Anda (Wi-fi atau kabel) ke jaringan lokal. Memasulkan alamat MAC biasanya lebih aman karena menyembunyikan lokasi geografis anda. Tapi itu mungkin juga membuat masalah konektivitas atau menimbulkan kecurigaan."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Palsukan semua alamat MAC (default)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "Jangan palsukan alamat MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Konfigurasi Jaringan"
+
+#: ../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 "Jika koneksi Internet Anda tersensor, tersaring atau terproxy, Anda dapat mengatur sebuah Tor bridge atau proxy lokal. Untuk sepenuhnya offline, Anda dapat menonaktifkan semua jaringan"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Tersambung langsung ke Jaringan Tor (default)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Atur Tor bridge atau proxy lokal"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Nonaktifkan semua jaringan"
+
+#: ../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 "Anda akan mengatur jembatan Tor dan proxy lokal nanti setelah terhubung ke jaringan."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Selamat datang di Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Bahasa & Wilayah"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Pengaturan Default"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "_Penyimpanan Menetap Terenkripsi"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Konfigurasi Penyimpanan Menetap"
+
+#. The label 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 "Masukkan kata kunci untuk memprotect volume persistent"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Kunci Kembali Penyimpanan Menetap"
+
+#: ../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 "Penyimpanan Menetap Anda tidak terkunci. Memulai kembali Tails untuk menguncinya lagi."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_Pengaturan Tambahan"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Tambah pengaturan tambahan"
+
+#: ../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 "Pengaturan default aman untuk banyak situasi. Untuk menambah pengaturan tambahan, tekan tombol \"+\" di bawah."
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "Wadah Berkas"
diff --git a/is.po b/is.po
index 7b6167c85..51eed4c0f 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 "_RÃ¦sa"
 msgid "_Exit"
 msgstr "_HÃ¦tta"
 
-#: 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 "Beint (sjÃ¡lfgefiÃ°)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "BrÃº og milliÃ¾jÃ³nn"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Ã?nettengt"
-
-#: 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 "AflÃ¦sa"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "TÃ³kst ekki aÃ° lÃ¦sa aftur varanlegri gagnageymslu."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
-msgstr "AflÃ¦siâ?¦"
-
-#: 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 "Get ekki aflÃ¦st dulritaÃ°ri gagnageymslu meÃ° Ã¾essum lykilfrasa."
-
-#: 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 "Aukastillingar"
 
-#: 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 "HÃ¦tta viÃ°"
 
-#: 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 "BÃ¦ta viÃ°"
 
-#: 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 "Til baka"
 
-#: 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 "L_ykilorÃ° kerfisstjÃ³rnunar"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "DulbÃºningur _MAC-vistfangs"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_Nettenging"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Beint (sjÃ¡lfgefiÃ°)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "BrÃº og milliÃ¾jÃ³nn"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Ã?nettengt"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "Kveikt (sjÃ¡lfgefiÃ°)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Kveikt"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "SlÃ¶kkt"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "SlÃ¶kkt (sjÃ¡lfgefiÃ°)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "SlÃ¶kkva"
 
-#: 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 "RÃ¦_sa 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 mistÃ³kst meÃ° svarkÃ³Ã°a {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"
@@ -177,7 +179,7 @@ msgid ""
 "{stderr}"
 msgstr "cryptsetup mistÃ³kst meÃ° svarkÃ³Ã°a {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"
@@ -185,7 +187,7 @@ msgid ""
 "{stderr}"
 msgstr "live-persist mistÃ³kst meÃ° svarkÃ³Ã°a {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"
@@ -193,225 +195,37 @@ msgid ""
 "{stderr}"
 msgstr "umount mistÃ³kst meÃ° svarkÃ³Ã°a {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 "LykilorÃ° kerfisstjÃ³rnunar"
-
-#: 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 "Settu upp lykilorÃ° fyrir kerfisstjÃ³rnun ef Ã¾Ãº Ã¾arft aÃ° sÃ½sla meÃ° kerfisstillingar. Annars er lykilorÃ° fyrir kerfisstjÃ³rnun haft Ã³virkt Ã Ã¶ryggisskyni."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Settu inn lykilorÃ° fyrir kerfisstjÃ³rnun"
-
-#: 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 "StaÃ°festa"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "StaÃ°festu lykilorÃ° kerfisstjÃ³rnunar"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Gera Ã³virkt"
-
-#. 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 dulargerfi"
-
-#. 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 "Ã?essi kostur lÃ¦tur Tails lÃta Ãºt eins og Microsoft Windows 10. Ã?etta getur reynst vel til aÃ° draga ekki aÃ° sÃ©r athygli Ã¡ opinberum stÃ¶Ã°um."
-
-#. 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 dulargerfi"
-
-#: 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 "DulbÃºningur MAC-vistfangs"
-
-#: 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 "DulbÃºningur MAC-vistfangs felur raÃ°nÃºmer netkortsins (Wi-Fi eÃ°a kapall) fyrir staÃ°arnetinu. DulbÃºningur MAC-vistfangs er almennt Ã¶ruggara Ã¾ar sem Ã¾aÃ° hjÃ¡lpar til viÃ° aÃ° fela staÃ°setningu Ã¾Ãna. En Ã¾aÃ° getur aftur valdiÃ° vandamÃ¡lum Ã tengingum eÃ°a litiÃ° grunsamlega Ãºt."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "DulbÃºa Ã¶ll MAC-vistfÃ¶ng (sjÃ¡lfgefiÃ°)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "Ekki dulbÃºa MAC-vistfÃ¶ng"
-
-#: 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 "Ã?Ãº munt setja upp Tor-brÃº og staÃ°vÃ¦ran milliÃ¾jÃ³n (proxy) sÃÃ°ar eftir aÃ° hafa tengst neti."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Velkomin Ã 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 "Til aÃ° fÃ¡ leiÃ°sÃ¶gn um stillingar Tails, smelltu Ã¡ <b>Fara Ã skoÃ°unarferÃ°</b> hÃ©r fyrir ofan"
+#: 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 "AflÃ¦sa"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "TungumÃ¡l og landsvÃ¦Ã°i"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "TÃ³kst ekki aÃ° lÃ¦sa aftur varanlegri gagnageymslu."
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "SjÃ¡lfgefnar stillingar"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
+msgstr "AflÃ¦siâ?¦"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Vista tungumÃ¡la- og svÃ¦Ã°isstillingar"
+#: 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 "Get ekki aflÃ¦st dulritaÃ°ri gagnageymslu meÃ° Ã¾essum lykilfrasa."
 
-#: 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 "TungumÃ¡_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 "Ly_klaborÃ°suppsetning"
 
-#: 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 "S_niÃ°"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_TÃmabelti"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "DulrituÃ° varanleg _gagnageymsla"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Birta lykilsetningu"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Stilla varanlega gagnageymslu"
-
-#. 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 "Settu inn lykilfrasann til aÃ° aflÃ¦sa varanlegu gagnageymslunni"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "LÃ¦sa aftur varanlegri gagnageymslu"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "Varanlega gagnageymslan Ã¾Ãn er Ã³lÃ¦st. EndurrÃ¦stu Tails til aÃ° lÃ¦sa henni aftur."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "ViÃ°bÃ³t_arstillingar"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Vista aukastillingar"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "BÃ¦ta viÃ° aukastillingum"
-
-#: 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 "Stillingar netkerfis"
-
-#: 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 "Ef Internet-tenging Ã¾essarar tÃ¶lvu er ritskoÃ°uÃ°, sÃuÃ° eÃ°a beint Ã gegnum milliÃ¾jÃ³n, Ã¾Ã¡ Ã¦ttir Ã¾Ãº aÃ° stilla Tor-brÃº eÃ°a milliÃ¾jÃ³n. Til aÃ° vinna Ã¡n nettengingar geturÃ°u gert netvinnslu Ã³virka."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Tengjast beint viÃ° Tor-netiÃ° (sjÃ¡lfgefiÃ°)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Stilla Tor-brÃº eÃ°a staÃ°vÃ¦ran milliÃ¾jÃ³n (proxy)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Afvirkja alla netvinnslu"
-
-#: 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 "SjÃ¡lfgefnar stillingar eru Ã flestum tilfellum nÃ³gu Ã¶ruggar. Til aÃ° bÃ¦ta viÃ° sÃ©rsniÃ°num stillingum, Ã½ttu Ã¡ \"+\" hnappinn hÃ©r fyrir neÃ°an."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "L_ykilorÃ° kerfisstjÃ³rnunar"
-
-#: 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 "SlÃ¶kkt (sjÃ¡lfgefiÃ°)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "DulbÃºningur _MAC-vistfangs"
-
-#: 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 "Kveikt (sjÃ¡lfgefiÃ°)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_Nettenging"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Windows dulargerfi"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Kveikt"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "SlÃ¶kkt"
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -710,6 +524,11 @@ msgstr "Settu upp lykilorÃ° til aÃ° aflÃ¦sa skjÃ¡num."
 msgid "Password"
 msgstr "LykilorÃ°"
 
+#: 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 "StaÃ°festa"
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr "Ã?essi ÃºtgÃ¡fa Tails er meÃ° Ã¾ekkt Ã¶ryggisvandamÃ¡l:"
@@ -806,35 +625,35 @@ msgstr "Opnar Onion-rÃ¡sir"
 
 #. 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} gagnageymsla"
 
 #. 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} (skrifvariÃ°)"
 
 #. 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} Ã {container_path}"
@@ -843,14 +662,14 @@ msgstr "{partition_name} Ã {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} Ã¡ {drive_name}"
@@ -859,42 +678,42 @@ msgstr "{partition_name} Ã¡ {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 "Rangt aÃ°gangsorÃ° eÃ°a viÃ°fÃ¶ng"
 
-#: 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 "Villa viÃ° aÃ° aflÃ¦sa gagnageymslu"
 
 #. 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 "Gat ekki aflÃ¦st gagnageymslu {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 "Eitt eÃ°a fleiri forrit eru aÃ° nota gagnageymsluna."
 
 #. 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 "Gat ekki lÃ¦st gagnageymslu {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 "Ekki tÃ³kst aÃ° lÃ¦sa gagnageymslunni"
 
@@ -1092,6 +911,130 @@ msgid ""
 " ($(command_line))"
 msgstr "AuÃ°kenningar er krafist til aÃ° fjarlÃ¦gja pakka Ãºr viÃ°bÃ³tarhugbÃºnaÃ°num Ã¾Ãnum ($(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 "LykilorÃ° kerfisstjÃ³rnunar"
+
+#: ../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 "Settu upp lykilorÃ° fyrir kerfisstjÃ³rnun ef Ã¾Ãº Ã¾arft aÃ° sÃ½sla meÃ° kerfisstillingar. Annars er lykilorÃ° fyrir kerfisstjÃ³rnun haft Ã³virkt Ã Ã¶ryggisskyni."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Settu inn lykilorÃ° fyrir kerfisstjÃ³rnun"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "StaÃ°festu lykilorÃ° kerfisstjÃ³rnunar"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Gera Ã³virkt"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "DulbÃºningur MAC-vistfangs"
+
+#: ../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 "DulbÃºningur MAC-vistfangs felur raÃ°nÃºmer netkortsins (Wi-Fi eÃ°a kapall) fyrir staÃ°arnetinu. DulbÃºningur MAC-vistfangs er almennt Ã¶ruggara Ã¾ar sem Ã¾aÃ° hjÃ¡lpar til viÃ° aÃ° fela staÃ°setningu Ã¾Ãna. En Ã¾aÃ° getur aftur valdiÃ° vandamÃ¡lum Ã tengingum eÃ°a litiÃ° grunsamlega Ãºt."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "DulbÃºa Ã¶ll MAC-vistfÃ¶ng (sjÃ¡lfgefiÃ°)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "Ekki dulbÃºa MAC-vistfÃ¶ng"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Stillingar netkerfis"
+
+#: ../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 "Ef Internet-tenging Ã¾essarar tÃ¶lvu er ritskoÃ°uÃ°, sÃuÃ° eÃ°a beint Ã gegnum milliÃ¾jÃ³n, Ã¾Ã¡ Ã¦ttir Ã¾Ãº aÃ° stilla Tor-brÃº eÃ°a milliÃ¾jÃ³n. Til aÃ° vinna Ã¡n nettengingar geturÃ°u gert netvinnslu Ã³virka."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Tengjast beint viÃ° Tor-netiÃ° (sjÃ¡lfgefiÃ°)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Stilla Tor-brÃº eÃ°a staÃ°vÃ¦ran milliÃ¾jÃ³n (proxy)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Afvirkja alla netvinnslu"
+
+#: ../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 "Ã?Ãº munt setja upp Tor-brÃº og staÃ°vÃ¦ran milliÃ¾jÃ³n (proxy) sÃÃ°ar eftir aÃ° hafa tengst neti."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Velkomin Ã Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "TungumÃ¡l og landsvÃ¦Ã°i"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "SjÃ¡lfgefnar stillingar"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "DulrituÃ° varanleg _gagnageymsla"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Stilla varanlega gagnageymslu"
+
+#. The label 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 "Settu inn lykilfrasann til aÃ° aflÃ¦sa varanlegu gagnageymslunni"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "LÃ¦sa aftur varanlegri gagnageymslu"
+
+#: ../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 "Varanlega gagnageymslan Ã¾Ãn er Ã³lÃ¦st. EndurrÃ¦stu Tails til aÃ° lÃ¦sa henni aftur."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "ViÃ°bÃ³t_arstillingar"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "BÃ¦ta viÃ° aukastillingum"
+
+#: ../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 "SjÃ¡lfgefnar stillingar eru Ã flestum tilfellum nÃ³gu Ã¶ruggar. Til aÃ° bÃ¦ta viÃ° sÃ©rsniÃ°num stillingum, Ã½ttu Ã¡ \"+\" hnappinn hÃ©r fyrir neÃ°an."
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "SkrÃ¡agÃ¡mar"
diff --git a/it.po b/it.po
index ae90dbdae..abd27e884 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 "Bridge & 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 "Sblocca"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Impossibile ribloccare il volume persistente."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
-msgstr "Sbloccaggio in corsoâ?¦"
-
-#: 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 "Impossibile sbloccare il volume cifrato con questa password."
-
-#: 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 "Impostazioni aggiuntive"
 
-#: 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 "Aggiungi"
 
-#: 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 "Indietro"
 
-#: 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 "_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 "Bridge & 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 "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 "Arresto"
 
-#: 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 "_Avvia 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 "predefinito: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 fallito con codice di ritorno {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"
@@ -201,7 +203,7 @@ msgid ""
 "{stderr}"
 msgstr "cryptsetup fallito con codice di ritorno {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"
@@ -209,7 +211,7 @@ msgid ""
 "{stderr}"
 msgstr "live-persist fallito con codice di ritorno {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"
@@ -217,225 +219,37 @@ msgid ""
 "{stderr}"
 msgstr "umount fallito con codice di ritorno {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 "Password di amministrazione"
-
-#: 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 "Imposta una password di amministratore se devi eseguire azioni di amministrazione. Altrimenti, la password di amministratore verrÃ  disabilitata per maggiore sicurezza."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Inserire una password di amministrazione"
-
-#: 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 "Confermare la password di amministrazione"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Disabilita"
-
-#. 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 "Mimetizzazione 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 "Questa opzione fa sembrare Tails come Microsoft Windows 10. PuÃ² essere utile per non attirare l'attenzione in luoghi pubblici."
-
-#. 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 "Camuffamento da 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 "Spoofing indirizzo 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 "Lo spoofing dell'indirizzo MAC nasconde il numero seriale della tua interfaccia di rete (Wi-Fi o cablata) alla rete locale. Lo spoofing degli indirizzi MAC di solito Ã¨ piÃ¹ sicuro ed aiuto a nascondere la posizione geografica. Ma potrebbe anche creare problemi di connessione o sembrare sospetto."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Spoof di tutti gli indirizzi MAC (predefinito)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "Nessuno spoof degli indirizzi 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 "Configurerai il bridge Tor e il proxy locale piÃ¹ tardi dopo la connessione a una rete."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Benvenuto in 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 "Per farti guidare tra le impostazioni di Tails, clicca <b>Fai un Tour</b> sopra"
+#: 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 "Sblocca"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Lingua & Regione"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Impossibile ribloccare il volume persistente."
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Impostazioni predefinite"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
+msgstr "Sbloccaggio in corsoâ?¦"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Salvare impostazioni di Lingua & Regione"
+#: 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 "Impossibile sbloccare il volume cifrato con questa password."
 
-#: 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 "_Lingua"
 
-#: 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 "_Disposizione tastiera"
 
-#: 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 "_Formati"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "Fuso _orario"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "_Volume persistente cifrato"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Mostra passphrase"
-
-#: 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 "Salvare Impostazioni aggiuntive"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Aggiungi un'impostazione aggiuntiva"
-
-#: 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 "Se la tua connessione internet Ã¨ censurata, filtrata o dietro un proxy, puoi configurare un bridge Tor o un proxy locale. Per lavorare completamente offline, puoi disattivare tutta la rete."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Connetti direttamente alla rete Tor (predefinito)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Configura un bridge Tor od un proxy locale"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Disattiva tutta l'attivitÃ  di rete"
-
-#: 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 "Password di amministrazione"
+
+#: ../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 "Imposta una password di amministratore se devi eseguire azioni di amministrazione. Altrimenti, la password di amministratore verrÃ  disabilitata per maggiore sicurezza."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Inserire una password di amministrazione"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Confermare la password di amministrazione"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Disabilita"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "Spoofing indirizzo 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 "Lo spoofing dell'indirizzo MAC nasconde il numero seriale della tua interfaccia di rete (Wi-Fi o cablata) alla rete locale. Lo spoofing degli indirizzi MAC di solito Ã¨ piÃ¹ sicuro ed aiuto a nascondere la posizione geografica. Ma potrebbe anche creare problemi di connessione o sembrare sospetto."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Spoof di tutti gli indirizzi MAC (predefinito)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "Nessuno spoof degli indirizzi MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in: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 "Se la tua connessione internet Ã¨ censurata, filtrata o dietro un proxy, puoi configurare un bridge Tor o un proxy locale. Per lavorare completamente offline, puoi disattivare tutta la rete."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Connetti direttamente alla rete Tor (predefinito)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Configura un bridge Tor od un proxy locale"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Disattiva tutta l'attivitÃ  di rete"
+
+#: ../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 "Configurerai il bridge Tor e il proxy locale piÃ¹ tardi dopo la connessione a una rete."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Benvenuto in Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Lingua & Regione"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Impostazioni predefinite"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "_Volume persistente cifrato"
+
+#: ../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 "Aggiungi un'impostazione aggiuntiva"
+
+#: ../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 1c0c315db..dca465a36 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 "èµ·å?? (_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 ""
-
-#: 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ã??å¤±æ??ã??ã?¾ã??ã??ã??å??é??ã?³ã?¼ã??ã?¯ {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"
@@ -195,7 +197,7 @@ msgid ""
 "{stderr}"
 msgstr "cryptsetup ã??å¤±æ??ã??ã?¾ã??ã??ã??å??é??ã?³ã?¼ã??ã?¯ {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"
@@ -203,7 +205,7 @@ msgid ""
 "{stderr}"
 msgstr "live-persistã??å¤±æ??ã??ã?¾ã??ã??ã??å??é??ã?³ã?¼ã??ã?¯ {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"
@@ -211,225 +213,37 @@ msgid ""
 "{stderr}"
 msgstr "unmount ã??å¤±æ??ã??ã?¾ã??ã??ã??å??é??ã?³ã?¼ã??ã?¯ {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ã?«ã?¢ã??ã?©ã?¼ã?¸ã?¥"
-
-#: 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 "Tailsã?®ã??ã?®ã??ã?¼ã?¸ã?§ã?³ã?«ã?¯ã??æ?¢ç?¥ã?®ã?»ã?ã?¥ã?ªã??ã?£å??é¡?ã??å?å?¨ã??ã?¾ã??:"
@@ -824,35 +643,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}"
@@ -861,14 +680,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 "{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} ã?«ã??ã?? {partition_name}"
@@ -877,42 +696,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 "{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 "ã??ã?¹ã??ã?¬ã?¼ã?ºã??ã??ã?©ã?¡ã?¼ã?¿ã?¼ã??é??é??ã?£ã?¦ã??ã?¾ã??"
 
-#: 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 ""
 
@@ -1110,6 +929,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/ka.po b/ka.po
index 62e1ac970..e621e2c81 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)"
-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 "_á??á??á??á??á??á? á?? á??á??á? á??á??á??"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_MAC-á??á??á?¡á??á??á??á? á??á??á?¡ á??á??á??á??á??á??á??á??á??á??"
+
+#: 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 "á??á??á??á??á??á?ªá??á??á?? á??á?? á??á? á??á?¥á?¡á??"
+
+#: 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"
 
-#. 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 á??á?  á??á?£á?¨á??á??á??á?¡, á?¨á??á?ªá??á??á??á??á?¡ á??á??á??á??á?? {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"
@@ -179,7 +181,7 @@ msgid ""
 "{stderr}"
 msgstr "cryptsetup á??á?  á??á?£á?¨á??á??á??á?¡, á?¨á??á?ªá??á??á??á??á?¡ á??á??á??á??á?? {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"
@@ -187,7 +189,7 @@ msgid ""
 "{stderr}"
 msgstr "live-persist á??á?  á??á?£á?¨á??á??á??á?¡, á?¨á??á?ªá??á??á??á??á?¡ á??á??á??á??á?? {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"
@@ -195,225 +197,37 @@ msgid ""
 "{stderr}"
 msgstr "umount á??á?  á??á?£á?¨á??á??á??á?¡, á?¨á??á?ªá??á??á??á??á?¡ á??á??á??á??á?? {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-á??á??á?¡á??á??á??á? á??á??á?¡ á??á??á??á??á??á??á??á??á??á??á?? á??á??á??á??á??á??á??á??á?? á??á?¥á??á??á??á?? á?¥á?¡á??á??á??á?¡ (á?£á?¡á??á??á??á??á??á?¡ á??á?? á?¡á??á??á??á??á??á??á??á??á?¡) á?¡á??á? á??á?£á??á?? á??á??á??á??á? á??, á??á??á??á??á??á??á??á? á??á?? á?¥á?¡á??á??á?¨á??. 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 "_á??á??á??"
 
-#: 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 "á??á?¥á??á??á??á?? á??á?£á??á??á??á??á?? á??á??á?®á?¡á??á??á? á??á??á?? á??á??á?®á?¡á??á??á??á??á??. á??á??á?¡ á?©á??á?¡á??á??á??á?¢á??á??, á?®á??á??á??á?®á??á?? á??á??á?£á?¨á??á??á?? Tails."
-
-#: 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 "á??á?£ á??á?¥á??á??á??á?? á??á??á?¢á??á? á??á??á?¢á??á??á??á?¨á??á? á?? á?ªá??á??á??á?£á? á??á?¡ á?¥á??á??á?¨á??á??, á??á?¤á??á??á?¢á? á??á??á?? á??á?? á??á? á??á?¥á?¡á??á?¡ á??á??á??á??á??á?? á??á?£á?¨á??á??á??á?¡, á?¨á??á??á??á?«á??á??á??á?? á??á??á??á??á? á??á??á?? 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 "_á??á??á??á??á??á? á?? á??á??á? á??á??á??"
-
-#: 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-á??á??á?¡á??á??á??á? á??á??á?¡ á??á??á??á??á??á??á??á??á??á??"
-
-#: 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 "_Windows-á??á?? á?¨á??á??á??á?¦á??á??á??"
-
-#: 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 "Tails-á??á?¡ á??á?? á??á??á? á?¡á??á??á?¡ á?£á?¡á??á?¤á? á??á?®á??á??á??á??á?¡ á?ªá??á??á??á??á??á?? á?®á??á? á??á??á??á??á??á?? á??á??á??á?©á??á??á??:"
@@ -808,35 +627,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 "{partition_name} â?? {container_path}"
@@ -845,14 +664,14 @@ msgstr "{partition_name} â?? {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} â?? {drive_name}"
@@ -861,42 +680,42 @@ msgstr "{partition_name} â?? {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 "á??á? á??á?¡á?¬á??á? á?? á??á??á? á??á??á?? á??á?? á??á??á? á??á??á??á?¢á? á??á??á??"
 
-#: 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 "á??á??á??á??á?§á??á?¤á??á?¡ á?©á??á??á??á?¢á??á?? á??á??á?  á??á??á?®á??á? á?®á??á??"
 
@@ -1094,6 +913,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-á??á??á?¡á??á??á??á? á??á??á?¡ á??á??á??á??á??á??á??á??á??á??á?? á??á??á??á??á??á??á??á??á?? á??á?¥á??á??á??á?? á?¥á?¡á??á??á??á?¡ (á?£á?¡á??á??á??á??á??á?¡ á??á?? á?¡á??á??á??á??á??á??á??á??á?¡) á?¡á??á? á??á?£á??á?? á??á??á??á??á? á??, á??á??á??á??á??á??á??á? á??á?? á?¥á?¡á??á??á?¨á??. 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 "á??á??á?¨á??á?¤á? á?£á??á?? _á??á?£á??á??á??á??á?? á??á??á?®á?¡á??á??á? á??á??á??"
+
+#: ../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 "_á??á??á??á??á?¢á??á??á??á??á?? á??á??á? á??á??á??á?¢á? á??á??á??"
+
+#: ../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 154713934..b50f40bec 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/ui/add_settings_dialog.py:46
+msgid "Add"
+msgstr "Ò?Ð¾Ñ?Ñ?"
+
+#: 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:398
-msgid "Offline"
+#: 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: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:156
+msgid "_MAC Address Spoofing"
 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:206
+msgid "_Network Connection"
 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:215
+msgid "Direct (default)"
 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:217
+msgid "Bridge & Proxy"
 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:219
+msgid "Offline"
 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:270
+msgid "On (default)"
+msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
-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/gui.py:617
-msgid "Back"
+#: 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:731
-msgid "Shutdown"
+#: 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/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 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:177
+msgid "_Start Tails"
 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"
@@ -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 "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 "{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} on {drive_name}"
@@ -860,42 +679,42 @@ msgstr "{partition_name} on {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 "Ò?Ð°Ñ?Ðµ Ò?Ò±Ð¿Ð¸Ñ? Ñ?Ó©Ð· Ð½ÐµÐ¼ÐµÑ?Ðµ Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ð»ÐµÑ?"
 
-#: 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 ""
 
-#: 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 "Ð¢Ò¯Ð¿Ð½Ò±Ñ?Ò?Ð°Ð»Ñ?Ò? Ñ?Ð°Ñ?Ñ?Ð°Ð¼Ð° Ð¿Ð°ÐºÐµÑ?Ñ?Ñ? Ò?Ð¾Ñ?Ñ?Ð¼Ñ?Ð° Ð±Ð°Ò?Ð´Ð°Ñ?Ð»Ð°Ð¼Ð°Ð»Ñ?Ò? Ò?Ò±Ñ?Ð°Ð»Ð´Ð°Ð½ Ð¶Ð¾Ñ? Ò¯Ñ?Ñ?Ð½ Ò?Ð°Ð¶ÐµÑ? ($(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 "Ð¤Ð°Ð¹Ð» ÐºÐ¾Ð½Ñ?ÐµÐ¹Ð½ÐµÑ?Ð»ÐµÑ?Ñ?"
diff --git a/km.po b/km.po
index 11021ed39..7d55d1cfa 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"
-msgstr ""
+#: 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"
-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: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/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"
-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/gui.py:617
-msgid "Back"
-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/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/ui/main_window.py:177
+msgid "_Start Tails"
 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"
@@ -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 "Windows Camouflage"
-
-#. 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 c547c82da..9193c221f 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 "Cancel"
+
+#: 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"
+#: 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/ui/additional_settings.py:274
+msgid "Off"
 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:276
+msgid "Off (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: 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"
@@ -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 36fd39f3c..8ba8562cd 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 "_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)"
-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 "_ê´?ë¦¬ì?? ë¹?ë°?ë²?í?¸"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_MAC ì£¼ì?? ì??ì?´ê¸°"
+
+#: 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 "ë¸?ë¦¿ì§? ë°? í??ë¡?ì??"
+
+#: 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 ì??ì??"
 
-#. 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 failed with return code {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"
@@ -184,7 +186,7 @@ msgid ""
 "{stderr}"
 msgstr "cryptsetup failed with return code {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"
@@ -192,7 +194,7 @@ msgid ""
 "{stderr}"
 msgstr "live-persist failed with return code {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"
@@ -200,225 +202,37 @@ msgid ""
 "{stderr}"
 msgstr "umount failed with return code {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 "ì??ë??ì?°ë¡? ì??ì?¥"
-
-#. 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ë¥¼ ë§?ì?´í?¬ë¡?ì??í??í?¸ ì??ë??ì?° 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 "ë§?ì?´í?¬ë¡?ì??í??í?¸ ì??ë??ì?° 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 ì£¼ì??ë¥¼ ì??ì?´ë©´ ë¡?ì»¬ ë?¤í?¸ì??í?¬ì??ì?? ê·?í??ì?? ë?¤í?¸ì??í?¬ ì?¸í?°í??ì?´ì?¤(ì??ì?´í??ì?´ í?¹ì?? ì? ì? )ì?? ì??ë¦¬ì?¼ ë²?í?¸ë¥¼ ì?¨ê¸¸ ì?? ì??ì?µë??ë?¤. 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 "_ì?¸ì?´"
 
-#: 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 "í?¼ì??ì?¤í?´í?¸ ì ?ì?¥ì??ê°? ì?´ë ¸ì?µë??ë?¤. ë?¤ì?? ì? ê·¸ë ¤ë©´ Tailsë¥¼ ì?¬ì??ì??í??ì?¸ì??."
-
-#: 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 "ì?¸í?°ë?· ì?°ê²°ì?´ ê²?ì?´, í??í?°, í?¹ì?? í??ë¡?ì??ë¥¼ ì?¬ì?©í??ë?¤ë©´ 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 "_ê´?ë¦¬ì?? ë¹?ë°?ë²?í?¸"
-
-#: 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 ì£¼ì?? ì??ì?´ê¸°"
-
-#: 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 "ì§?ê¸? ë²?ì ? Tailsì?? ë³´ì??ì?? ë¬¸ì ?ê°? ì??ì?µë??ë?¤."
@@ -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 "{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 "{partition_name} ì?? ì??ë?? {container_path}"
@@ -850,14 +669,14 @@ msgstr "{partition_name} ì?? ì??ë?? {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} on {drive_name}"
@@ -866,42 +685,42 @@ msgstr "{partition_name} on {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 "í??ë¦° ë¹?ë°?ë²?í?¸"
 
-#: 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 ""
 
@@ -1099,6 +918,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 ì£¼ì??ë¥¼ ì??ì?´ë©´ ë¡?ì»¬ ë?¤í?¸ì??í?¬ì??ì?? ê·?í??ì?? ë?¤í?¸ì??í?¬ ì?¸í?°í??ì?´ì?¤(ì??ì?´í??ì?´ í?¹ì?? ì? ì? )ì?? ì??ë¦¬ì?¼ ë²?í?¸ë¥¼ ì?¨ê¸¸ ì?? ì??ì?µë??ë?¤. 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 "ì??í?¸í??ë?? _ì??êµ¬ ì ?ì?¥ì??"
+
+#: ../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 "_ì¶?ê°? ì?¤ì ?"
+
+#: ../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 f39612815..3868d3efe 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 "Pa_leisti"
 msgid "_Exit"
 msgstr "IÅ¡_eiti"
 
-#: 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 "Tiesioginis (numatytasis)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "TinklÅ³ tiltas ir Ä¯galiotasis serveris"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Nepasiekiama(-s)"
-
-#: 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 "Atrakinti"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Nepavyko iÅ¡ naujo uÅ¾rakinti ilgalaikÄ¯ kaupiklÄ¯."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
-msgstr "Atrakinamaâ?¦"
-
-#: 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 "Nepavyksta su Å¡ia slaptafraze atrakinti ilgalaikio kaupiklio."
-
-#: 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 "Papildomi nustatymai"
 
-#: 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 "Atsisakyti"
 
-#: 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 "PridÄ?ti"
 
-#: 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 "Atgal"
 
-#: 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 "_Administravimo slaptaÅ¾odis"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_MAC adresÅ³ klastojimas"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "Ti_nklo ryÅ¡ys"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Tiesioginis (numatytasis)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "TinklÅ³ tiltas ir Ä¯galiotasis serveris"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Nepasiekiama(-s)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "Ä®jungta (numatytasis)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Ä®jungta"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "IÅ¡jungta"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "IÅ¡jungta (numatytasis)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "IÅ¡jungti"
 
-#: 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 "Palei_sti 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 patyrÄ? nesÄ?kmÄ? su grÄ¯Å¾ties kodu {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"
@@ -179,7 +181,7 @@ msgid ""
 "{stderr}"
 msgstr "cryptsetup patyrÄ? nesÄ?kmÄ? su grÄ¯Å¾ties kodu {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"
@@ -187,7 +189,7 @@ msgid ""
 "{stderr}"
 msgstr "live-persist patyrÄ? nesÄ?kmÄ? su grÄ¯Å¾ties kodu {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"
@@ -195,225 +197,37 @@ msgid ""
 "{stderr}"
 msgstr "umount patyrÄ? nesÄ?kmÄ? su grÄ¯Å¾ties kodu {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 "Administravimo slaptaÅ¾odis"
-
-#: 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 "Jeigu jums reikia atlikti administravimo uÅ¾duotis, nusistatykite administravimo slaptaÅ¾odÄ¯. PrieÅ¡ingu atveju, didesnio saugumo sumetimais slaptaÅ¾odis bus iÅ¡jungtas."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Ä®veskite administravimo slaptaÅ¾odÄ¯"
-
-#: 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 "Pakartokite savo administravimo slaptaÅ¾odÄ¯"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "IÅ¡jungti"
-
-#. 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 maskuotÄ?"
-
-#. 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 "Å is parametras padaro taip, kad Tails atrodytÅ³ lyg Microsoft Windows 10. Tai gali praversti vieÅ¡ose vietose, siekiant iÅ¡vengti Ä¯tarimÅ³."
-
-#. 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 maskuotÄ?"
-
-#: 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 adresÅ³ klastojimas"
-
-#: 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 adresÅ³ klastojimas nuslepia jÅ«sÅ³ tinklo sÄ?sajos (belaidÄ?s ar laidinÄ?s) serijos numerÄ¯ vietiniame tinkle. Bendrai, MAC adresÅ³ klastojimas yra saugesnis, nes padeda nuslÄ?pti jÅ«sÅ³ geografinÄ? vietÄ?. TaÄ?iau jis taip pat gali sukelti ryÅ¡io problemÅ³ arba atrodyti Ä¯tartinai."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Klastoti visus MAC adresus (numatytasis)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "Neklastoti MAC adresus"
-
-#: 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 "JÅ«s sukonfigÅ«ruosite Tor tinklÅ³ tiltÄ? ir vietinÄ¯ Ä¯galiotÄ?jÄ¯ serverÄ¯ vÄ?liau, po prisijungimo prie tinklo."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Sveiki atvykÄ? Ä¯ 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 "NorÄ?dami bÅ«ti supaÅ¾indinti su Tails nustatymais, virÅ¡uje spustelÄ?kite ant <b>Rodyti vadovÄ?</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 "Atrakinti"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Kalba ir regionas"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Nepavyko iÅ¡ naujo uÅ¾rakinti ilgalaikÄ¯ kaupiklÄ¯."
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Numatytieji nustatymai"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
+msgstr "Atrakinamaâ?¦"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Ä®raÅ¡yti kalbos ir regiono nustatymus"
+#: 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 "Nepavyksta su Å¡ia slaptafraze atrakinti ilgalaikio kaupiklio."
 
-#: 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 "Ka_lba"
 
-#: 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 "_KlaviatÅ«ros iÅ¡dÄ?stymas"
 
-#: 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 "_Formatai"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "Laiko juos_ta"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Å ifruotas ilgalaikis kau_piklis"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Rodyti slaptafrazÄ?"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "KonfigÅ«ruoti ilgalaikÄ¯ kaupiklÄ¯"
-
-#. 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 "Ä®veskite savo slaptafrazÄ?, kad atrakintumÄ?te ilgalaikÄ¯ kaupiklÄ¯"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "IÅ¡ naujo uÅ¾rakinti ilgalaikÄ¯ kaupiklÄ¯"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "JÅ«sÅ³ ilgalaikis kaupiklis yra atrakintas. Paleiskite Tails iÅ¡ naujo, norÄ?dami jÄ¯ vÄ?l uÅ¾rakinti. "
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "P_apildomi nustatymai"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Ä®raÅ¡yti papildomus nustatymus"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "PridÄ?ti papildomÄ? nustatymÄ?"
-
-#: 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 "Tinklo konfigÅ«ravimas"
-
-#: 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 "Jeigu jÅ«sÅ³ interneto ryÅ¡ys yra cenzÅ«ruojamas, filtruojamas ar jungiamas per Ä¯galiotÄ?jÄ¯ serverÄ¯, tuomet galite konfigÅ«ruoti Tor tinklÅ³ tiltÄ? ar vietinÄ¯ Ä¯galiotÄ?jÄ¯ serverÄ¯. NorÄ?dami dirbti visiÅ¡kai atsijungus nuo tinklo, galite iÅ¡jungti visÄ? darbÄ? tinkle."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Prisijungti tiesiogiai prie Tor tinklo (numatytasis)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "KonfigÅ«ruoti Tor tinklÅ³ tiltÄ? ar vietinÄ¯ Ä¯galiotÄ?jÄ¯ serverÄ¯"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "IÅ¡jungti visÄ? darbÄ? tinkle"
-
-#: 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 "Numatytieji nustatymai daugelyje situacijÅ³ yra saugÅ«s. NorÄ?dami pridÄ?ti pasirinktinÄ¯ nustatymÄ?, Å¾emiau spustelÄ?kite mygtukÄ? \"+\"."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Administravimo slaptaÅ¾odis"
-
-#: 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 "IÅ¡jungta (numatytasis)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_MAC adresÅ³ klastojimas"
-
-#: 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 "Ä®jungta (numatytasis)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "Ti_nklo ryÅ¡ys"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Windows maskuotÄ?"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Ä®jungta"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "IÅ¡jungta"
-
 #: 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 "Atverti Onion grandines"
 
 #. 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} tomas"
 
 #. 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} (Tik skaitymui)"
 
 #. 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} ties {container_path}"
@@ -845,14 +664,14 @@ msgstr "{partition_name} ties {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} ties {drive_name}"
@@ -861,42 +680,42 @@ msgstr "{partition_name} ties {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 "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 "Nepavyko atrakinti tomo {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 "Viena ar daugiau programÅ³ laiko tomÄ? uÅ¾imtÄ?."
 
 #. 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 "Nepavyko uÅ¾rakinti tomo {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 "Tomo uÅ¾rakinimas nepavyko"
 
@@ -1094,6 +913,130 @@ msgid ""
 " ($(command_line))"
 msgstr "Reikalingas tapatybÄ?s nustatymas, norint paÅ¡alinti paketÄ? iÅ¡ jÅ«sÅ³ papildomos programinÄ?s Ä¯rangos ($(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 "Administravimo slaptaÅ¾odis"
+
+#: ../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 "Jeigu jums reikia atlikti administravimo uÅ¾duotis, nusistatykite administravimo slaptaÅ¾odÄ¯. PrieÅ¡ingu atveju, didesnio saugumo sumetimais slaptaÅ¾odis bus iÅ¡jungtas."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Ä®veskite administravimo slaptaÅ¾odÄ¯"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Pakartokite savo administravimo slaptaÅ¾odÄ¯"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "IÅ¡jungti"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "MAC adresÅ³ klastojimas"
+
+#: ../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 adresÅ³ klastojimas nuslepia jÅ«sÅ³ tinklo sÄ?sajos (belaidÄ?s ar laidinÄ?s) serijos numerÄ¯ vietiniame tinkle. Bendrai, MAC adresÅ³ klastojimas yra saugesnis, nes padeda nuslÄ?pti jÅ«sÅ³ geografinÄ? vietÄ?. TaÄ?iau jis taip pat gali sukelti ryÅ¡io problemÅ³ arba atrodyti Ä¯tartinai."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Klastoti visus MAC adresus (numatytasis)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "Neklastoti MAC adresus"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Tinklo konfigÅ«ravimas"
+
+#: ../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 "Jeigu jÅ«sÅ³ interneto ryÅ¡ys yra cenzÅ«ruojamas, filtruojamas ar jungiamas per Ä¯galiotÄ?jÄ¯ serverÄ¯, tuomet galite konfigÅ«ruoti Tor tinklÅ³ tiltÄ? ar vietinÄ¯ Ä¯galiotÄ?jÄ¯ serverÄ¯. NorÄ?dami dirbti visiÅ¡kai atsijungus nuo tinklo, galite iÅ¡jungti visÄ? darbÄ? tinkle."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Prisijungti tiesiogiai prie Tor tinklo (numatytasis)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "KonfigÅ«ruoti Tor tinklÅ³ tiltÄ? ar vietinÄ¯ Ä¯galiotÄ?jÄ¯ serverÄ¯"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "IÅ¡jungti visÄ? darbÄ? tinkle"
+
+#: ../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 "JÅ«s sukonfigÅ«ruosite Tor tinklÅ³ tiltÄ? ir vietinÄ¯ Ä¯galiotÄ?jÄ¯ serverÄ¯ vÄ?liau, po prisijungimo prie tinklo."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Sveiki atvykÄ? Ä¯ Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Kalba ir regionas"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Numatytieji nustatymai"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Å ifruotas ilgalaikis kau_piklis"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "KonfigÅ«ruoti ilgalaikÄ¯ kaupiklÄ¯"
+
+#. The label 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 "Ä®veskite savo slaptafrazÄ?, kad atrakintumÄ?te ilgalaikÄ¯ kaupiklÄ¯"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "IÅ¡ naujo uÅ¾rakinti ilgalaikÄ¯ kaupiklÄ¯"
+
+#: ../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 "JÅ«sÅ³ ilgalaikis kaupiklis yra atrakintas. Paleiskite Tails iÅ¡ naujo, norÄ?dami jÄ¯ vÄ?l uÅ¾rakinti. "
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "P_apildomi nustatymai"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "PridÄ?ti papildomÄ? nustatymÄ?"
+
+#: ../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 "Numatytieji nustatymai daugelyje situacijÅ³ yra saugÅ«s. NorÄ?dami pridÄ?ti pasirinktinÄ¯ nustatymÄ?, Å¾emiau spustelÄ?kite mygtukÄ? \"+\"."
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "FailÅ³ konteineriai"
diff --git a/lv.po b/lv.po
index 34a613098..3e513719d 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 "_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)"
-msgstr "TieÅ¡s (noklusÄ?juma vÄ?rtÄ«ba)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Tilti un starpniekserveri"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "BezsaistÄ?"
-
-#: 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 "AtslÄ?gt"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "NeizdevÄ?s atkÄ?rtoti bloÄ·Ä?t pastÄ?vÄ«go krÄ?tuvi."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
-msgstr "AtslÄ?dz..."
-
-#: 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 "Ar Å¡o paroles frÄ?zi nav iespÄ?jams atbloÄ·Ä?t Å¡ifrÄ?to krÄ?tuvi. "
-
-#: 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 "Papildu iestatÄ«jumi"
 
-#: 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 "Atcelt"
 
-#: 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 "Pievienot"
 
-#: 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 "AtpakaÄ¼"
 
-#: 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 "_Administratora parole"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_MAC adreÅ¡u imitÄ?Å¡ana"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_TÄ«kla savienojums"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "TieÅ¡s (noklusÄ?juma vÄ?rtÄ«ba)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Tilti un starpniekserveri"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "BezsaistÄ?"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "IeslÄ?gts (noklusÄ?juma vÄ?rtÄ«ba)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "IeslÄ?gt"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "IzslÄ?gt"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "IzslÄ?gts (noklusÄ?juma vÄ?rtÄ«ba)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "IzslÄ?gÅ¡ana"
 
-#: 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 "_Palaist 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 "noklusÄ?jums: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 neizdevÄ?s, norÄ?dÄ«tais kods {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"
@@ -178,7 +180,7 @@ msgid ""
 "{stderr}"
 msgstr "cryptsetup neizdevÄ?s, norÄ?dÄ«tais kods {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"
@@ -186,7 +188,7 @@ msgid ""
 "{stderr}"
 msgstr "dinamisks-pastÄ?vÄ«gums nesekmÄ«gs ar atgriezes kodu {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"
@@ -194,225 +196,37 @@ msgid ""
 "{stderr}"
 msgstr "umount neizdevÄ?s, norÄ?dÄ«tais kods {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 "AdministrÄ?Å¡anas parole"
-
-#: 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 "Ja Jums jÄ?veic administrÄ?Å¡ana, izveidojiet administrÄ?Å¡anas paroli.\nParoli neizveidojot, lielÄ?kas droÅ¡Ä«bas dÄ?Ä¼, administrÄ?Å¡anas parole tiks atspÄ?jota."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "IevadÄ«t administrÄ?Å¡anas paroli"
-
-#: 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 "ApstiprinÄ?t"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Apstipriniet savu administrÄ?Å¡anas paroli"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "AtspÄ?jot"
-
-#. 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 kamuflÄ?Å¾a"
-
-#. 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 "Å Ä« iespÄ?ja padara Tails pÄ?c izskata lÄ«dzÄ«gÄ?ku Microsoft Windows 10. Tas var bÅ«t derÄ«gi publiskÄ?s vietÄ?s, lai izvairÄ«tos no aizdomu radÄ«Å¡anas."
-
-#. 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 kamuflÄ?Å¾a"
-
-#: 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 adreses maldinoÅ¡a maiÅ?a"
-
-#: 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 adreses maldinoÅ¡a maiÅ?a jeb spÅ«fings slÄ?pj vietÄ?jiem tÄ«kliem JÅ«su tÄ«kla saskarnes (Wi-Fi vai vadu) seriÄ?lo numuru. VispÄ?rÄ«gÄ? gadÄ«jumÄ? MAC adreses maldinoÅ¡a maiÅ?a ir droÅ¡Ä?ka, jo tÄ? palÄ«dz slÄ?pt JÅ«su Ä£eogrÄ?fiskÄ?s atraÅ¡anÄ?s vietu. TaÄ?u tÄ? var izraisÄ«t arÄ« savienojamÄ«bas problÄ?mas vai izskatÄ«ties aizdomÄ«ga."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "MaldinoÅ¡i norÄ?dÄ«t visas MAC adreses (noklusÄ?juma vÄ?rtÄ«ba)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "MaldinoÅ¡i nenorÄ?dÄ«t MAC adreses"
-
-#: 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 "VÄ?lÄ?k, pÄ?c tam, kad izveidosit savienojumu ar tÄ«klu, JÅ«s konfigurÄ?sit Tor tiltu vai vietÄ?jo starpniekserveri."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "SveicinÄ?ti 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 "Lai uzzinÄ?tu vairÄ?k par Tails iestatÄ«jumiem, noklikÅ¡Ä·iniet uz <b>IepazÄ«stieties</b> augstÄ?k."
+#: 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 "AtslÄ?gt"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Valoda un reÄ£ions"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "NeizdevÄ?s atkÄ?rtoti bloÄ·Ä?t pastÄ?vÄ«go krÄ?tuvi."
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "NoklusÄ?juma iestatÄ«jumi"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
+msgstr "AtslÄ?dz..."
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "SaglabÄ?t valodas un reÄ£iona iestatÄ«jumus"
+#: 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 "Ar Å¡o paroles frÄ?zi nav iespÄ?jams atbloÄ·Ä?t Å¡ifrÄ?to krÄ?tuvi. "
 
-#: 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 "_Valoda"
 
-#: 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 "_KlaviatÅ«ras izkÄ?rtojums"
 
-#: 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 "_FormÄ?ts"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Laika zona"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Å ifrÄ?ta _PastÄ?vÄ«gÄ? uzglabÄ?Å¡ana"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "ParÄ?dÄ«t paroles frÄ?zi"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "KonfigurÄ?t pastÄ?vÄ«go krÄ?tuvi"
-
-#. 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 "Ievadiet savu paroles frÄ?zi, lai atslÄ?gtu pastÄ?vÄ«go krÄ?tuvi"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "AtkÄ?rtoti bloÄ·Ä?t pastÄ?vÄ«go krÄ?tuvi"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "JÅ«su pastÄ?vÄ«gÄ? krÄ?tuve ir atbloÄ·Ä?ta. RestartÄ?jiet Tails, lai to atkal bloÄ·Ä?tu."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_Papildu iestatÄ«jumi"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "SaglabÄ?t papildu iestatÄ«jumus"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Pievienot papildu iestatÄ«jumu"
-
-#: 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 "TÄ«kla konfigurÄ?Å¡ana"
-
-#: 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 "Ja JÅ«su interneta savienojums tiek cenzÄ?ts, filtrÄ?ts vai starpniekots, JÅ«s varat nokonfigurÄ?t Tor tiltu vai vietÄ?jo starpniekserveri. Lai pilnÄ«gi strÄ?dÄ?tu bezsaistÄ?, JÅ«s varat atspÄ?jot jebkÄ?du tÄ«kloÅ¡anu."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Veidot tieÅ¡u savienojumu ar tÄ«klu Tor (noklusÄ?juma vÄ?rtÄ«ba)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "KonfigurÄ?t Tor tiltu vai vietÄ?jo starpniekserveri"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "AtspÄ?jot jebkÄ?du tÄ«kloÅ¡anu"
-
-#: 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 "VairumÄ? gadÄ«jumu noklusÄ?juma vÄ?rtÄ«bas ir droÅ¡as. Lai pievienotu pielÄ?gotus iestatÄ«jumus, nospiediet tÄ?lÄ?k esoÅ¡o \"+\" pogu."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Administratora parole"
-
-#: 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 "IzslÄ?gts (noklusÄ?juma vÄ?rtÄ«ba)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_MAC adreÅ¡u imitÄ?Å¡ana"
-
-#: 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 "IeslÄ?gts (noklusÄ?juma vÄ?rtÄ«ba)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_TÄ«kla savienojums"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Windows kamuflÄ?Å¾a"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "IeslÄ?gt"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "IzslÄ?gt"
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -711,6 +525,11 @@ msgstr ""
 msgid "Password"
 msgstr "Parole"
 
+#: 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 "ApstiprinÄ?t"
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr "Å ai Tails versijai ir apzinÄ?tas Å¡Ä?das droÅ¡Ä«bas problÄ?mas:"
@@ -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 "AdministrÄ?Å¡anas parole"
+
+#: ../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 "Ja Jums jÄ?veic administrÄ?Å¡ana, izveidojiet administrÄ?Å¡anas paroli.\nParoli neizveidojot, lielÄ?kas droÅ¡Ä«bas dÄ?Ä¼, administrÄ?Å¡anas parole tiks atspÄ?jota."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "IevadÄ«t administrÄ?Å¡anas paroli"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Apstipriniet savu administrÄ?Å¡anas paroli"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "AtspÄ?jot"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "MAC adreses maldinoÅ¡a maiÅ?a"
+
+#: ../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 adreses maldinoÅ¡a maiÅ?a jeb spÅ«fings slÄ?pj vietÄ?jiem tÄ«kliem JÅ«su tÄ«kla saskarnes (Wi-Fi vai vadu) seriÄ?lo numuru. VispÄ?rÄ«gÄ? gadÄ«jumÄ? MAC adreses maldinoÅ¡a maiÅ?a ir droÅ¡Ä?ka, jo tÄ? palÄ«dz slÄ?pt JÅ«su Ä£eogrÄ?fiskÄ?s atraÅ¡anÄ?s vietu. TaÄ?u tÄ? var izraisÄ«t arÄ« savienojamÄ«bas problÄ?mas vai izskatÄ«ties aizdomÄ«ga."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "MaldinoÅ¡i norÄ?dÄ«t visas MAC adreses (noklusÄ?juma vÄ?rtÄ«ba)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "MaldinoÅ¡i nenorÄ?dÄ«t MAC adreses"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "TÄ«kla konfigurÄ?Å¡ana"
+
+#: ../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 "Ja JÅ«su interneta savienojums tiek cenzÄ?ts, filtrÄ?ts vai starpniekots, JÅ«s varat nokonfigurÄ?t Tor tiltu vai vietÄ?jo starpniekserveri. Lai pilnÄ«gi strÄ?dÄ?tu bezsaistÄ?, JÅ«s varat atspÄ?jot jebkÄ?du tÄ«kloÅ¡anu."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Veidot tieÅ¡u savienojumu ar tÄ«klu Tor (noklusÄ?juma vÄ?rtÄ«ba)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "KonfigurÄ?t Tor tiltu vai vietÄ?jo starpniekserveri"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "AtspÄ?jot jebkÄ?du tÄ«kloÅ¡anu"
+
+#: ../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 "VÄ?lÄ?k, pÄ?c tam, kad izveidosit savienojumu ar tÄ«klu, JÅ«s konfigurÄ?sit Tor tiltu vai vietÄ?jo starpniekserveri."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "SveicinÄ?ti Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Valoda un reÄ£ions"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "NoklusÄ?juma iestatÄ«jumi"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Å ifrÄ?ta _PastÄ?vÄ«gÄ? uzglabÄ?Å¡ana"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "KonfigurÄ?t pastÄ?vÄ«go krÄ?tuvi"
+
+#. The label 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 "Ievadiet savu paroles frÄ?zi, lai atslÄ?gtu pastÄ?vÄ«go krÄ?tuvi"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "AtkÄ?rtoti bloÄ·Ä?t pastÄ?vÄ«go krÄ?tuvi"
+
+#: ../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 "JÅ«su pastÄ?vÄ«gÄ? krÄ?tuve ir atbloÄ·Ä?ta. RestartÄ?jiet Tails, lai to atkal bloÄ·Ä?tu."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_Papildu iestatÄ«jumi"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Pievienot papildu iestatÄ«jumu"
+
+#: ../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 "VairumÄ? gadÄ«jumu noklusÄ?juma vÄ?rtÄ«bas ir droÅ¡as. Lai pievienotu pielÄ?gotus iestatÄ«jumus, nospiediet tÄ?lÄ?k esoÅ¡o \"+\" pogu."
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr ""
diff --git a/mk.po b/mk.po
index 346712c81..03d59d5cf 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)"
-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 "_Ð?Ð´Ð¼Ð¸Ð½Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¾Ñ?Ñ?ÐºÐ° Ð?Ð¾Ð·Ð¸Ð½ÐºÐ°"
+
+#: 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 "Ð?Ð¾Ñ?Ñ? Ð¸ Ð?Ñ?Ð¾ÐºÑ?Ð¸"
+
+#: 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"
 
-#. 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 "Ñ?Ñ?Ð°Ð½Ð´Ð°Ñ?Ð´ÐµÐ½: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"
@@ -177,7 +179,7 @@ msgid ""
 "{stderr}"
 msgstr "cryptsetup Ð½Ðµ Ñ?Ñ?Ð¿ÐµÐ° Ñ?Ð¾ Ð¿Ð¾Ð²Ñ?Ð°Ñ?ÐµÐ½ ÐºÐ¾Ð´ {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"
@@ -185,7 +187,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"
@@ -193,225 +195,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 "_Ð?Ð°Ð·Ð¸Ðº"
 
-#: 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 "Ð?Ð°Ñ?Ð¸Ð¾Ñ? Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð°Ð½ Ñ?ÐºÐ°Ð»Ð´ Ðµ Ð¾Ñ?ÐºÐ»Ñ?Ñ?ÐµÐ½. Ð?Ð¾Ð²Ñ?Ð¾Ñ?Ð½Ð¾ Ñ?Ñ?Ð°Ñ?Ñ?Ñ?Ð²Ð°Ñ?Ñ?Ðµ Ð³Ð¾ Tails "
-
-#: 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 "Ð?ÐºÐ¾ Ð²Ð°Ñ?ÐµÑ?Ð¾ Ð¿Ð¾Ð²Ñ?Ð·Ñ?Ð²Ð°Ñ?Ðµ Ð½Ð° Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ðµ Ñ?ÐµÐ½Ð·Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ð¾, Ñ?Ð¸Ð»Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ð¾, Ð¸Ð»Ð¸ Ðµ Ð¿Ñ?ÐµÐºÑ? Ð¿Ñ?Ð¾ÐºÑ?Ð¸ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð´Ð° Ð³Ð¾ ÐºÐ¾Ð½Ñ?Ð¸Ð³Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ðµ 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 "_Ð?Ð´Ð¼Ð¸Ð½Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¾Ñ?Ñ?ÐºÐ° Ð?Ð¾Ð·Ð¸Ð½ÐºÐ°"
-
-#: 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 "_Windows Ð?Ð°Ñ?ÐºÐ¸Ñ?Ð°Ñ?Ðµ"
-
-#: 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 "{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 ""
 
 #. 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 "{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 ""
@@ -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 "{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 ""
 
-#: 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 "Ð¡Ð¿Ñ?Ñ?Ð¸Ð½Ð³ Ð½Ð° 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 "Ð?Ð½ÐºÑ?Ð¸Ð¿Ñ?Ð¸Ñ?Ð°Ð½_Ð?Ð¾Ñ?Ñ?Ð¾Ñ?Ð°Ð½ Ñ?ÐºÐ»Ð°Ð´"
+
+#: ../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 "_Ð?Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ?ÐµÐ»Ð½Ð¸ Ð¿Ð¾Ñ?Ñ?Ð°Ð²ÐºÐ¸"
+
+#: ../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 9064bf83c..25d98faef 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 "Cancel"
+
+#: 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/ui/add_settings_dialog.py:54
+msgid "Back"
+msgstr "à´ªà´¿à´¨àµ?à´¨àµ?à´?àµ?à´?àµ?"
+
+#: 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:398
-msgid "Offline"
+#: 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: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:206
+msgid "_Network Connection"
 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:215
+msgid "Direct (default)"
 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:217
+msgid "Bridge & Proxy"
 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:219
+msgid "Offline"
 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:270
+msgid "On (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"
-msgstr "Cancel"
+#: 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:609
-msgid "Add"
-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/gui.py:617
-msgid "Back"
-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/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: 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"
@@ -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!"
+#: 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 ""
 
-#. 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:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-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 f9132a086..f5b1a107f 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 "Cancel"
+
+#: 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/ui/add_settings_dialog.py:54
+msgid "Back"
 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/additional_settings.py:56
+msgid "_Administration Password"
 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:156
+msgid "_MAC Address Spoofing"
 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:206
+msgid "_Network Connection"
 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:215
+msgid "Direct (default)"
 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:217
+msgid "Bridge & Proxy"
 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:219
+msgid "Offline"
 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"
+#: 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:609
-msgid "Add"
-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/gui.py:617
-msgid "Back"
+#: 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/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: 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"
@@ -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 7575f8ee0..715e43727 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 "_Lancar"
 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)"
-msgstr "Terus (lalai)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Titi & Proksi"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Luar Talian"
-
-#: 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 "Buka"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Gagal mengunci semula storan berterusan."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
-msgstr "Membuka..."
-
-#: 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 "Tidak dapat buka storan tersulit dengan frasa laluan ini."
-
-#: 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 "Tetapan Tambahan"
 
-#: 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 "Batal"
 
-#: 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 "Tambah"
 
-#: 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 "Kembali"
 
-#: 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 "Kata _Laluan Pentadbiran"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "Perdayaan Alamat _MAC"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "Sambungan _Rangkaian"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Terus (lalai)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Titi & Proksi"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Luar Talian"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "Hidup (lalai)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Hidup"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Mati"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Mati (lalai)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "Matikan"
 
-#: 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 "_Mula 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 gagal dengan kod kembali {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"
@@ -180,7 +182,7 @@ msgid ""
 "{stderr}"
 msgstr "cryptsetup gagal dengan kod kembali {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"
@@ -188,7 +190,7 @@ msgid ""
 "{stderr}"
 msgstr "live-persist gagal dengan kod kembali {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"
@@ -196,225 +198,37 @@ msgid ""
 "{stderr}"
 msgstr "umount gagal dengan kod kembali {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 "Kata Laluan Pentadbiran"
-
-#: 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 "Sediakan satu kata laluan pentadbiran jika anda perlu lakukan tugas-tugas pentadbir. Jika sebaliknya, kata laluan pentadbiran dilumpuhkan atas sebab keselamatan."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Masukkan kata laluan pentadbiran"
-
-#: 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 "Sahkan"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Sahkan kata laluan pentadbiran anda"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Lumpuhkan"
-
-#. 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 "Penyamaran 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 "Tetapan ini akan membuatkan Tails akan lebih kelihatan seperti Windows 10. Ini mungkin berguna di tempat-tempat awam untuk mengelakkan perhatian syak wasangka."
-
-#. 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 "Penyamaran 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 "Perdayaan Alamat 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 "Perdayaan alamat MAC menyembunyikan nombor siri antaramuka rangkaian anda (Wi-Fi atau berwayar) kepada rangkaian setempat. Perdayaan alamat MAC biasa lebih selamat kerana ia dapat membantu anda sembunyikan lokasi geografi anda. Tetapi ia mungkin menyebabkan masalah sambungan atau akan menimbulkan syak wasangka."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Perdaya semua alamat MAC (lalai)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "Jangan perdaya alamat-alamat 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 "Anda akan konfigur titi Tor dan proksi setempat kemudian selepas bersambung dengan rangkaian."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Selamat datang ke 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 "Untuk mendapatkan panduan ketika mengendali Tetapan Tails, klik pada <b>Jelajah Terpandu</b> di atas"
+#: 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 "Buka"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Bahasa & Wilayah"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Gagal mengunci semula storan berterusan."
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Tetapan Lalai"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
+msgstr "Membuka..."
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Simpan Tetapan Bahasa & Wilayah"
+#: 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 "Tidak dapat buka storan tersulit dengan frasa laluan ini."
 
-#: 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 "_Bahasa"
 
-#: 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 "Bentangan _Papan Kekunci"
 
-#: 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 "_Format"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Zon Waktu"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Storan _Berterusan Tersulit"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Tunjuk Frasa Laluan"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Konfigur Storan Berterusan"
-
-#. 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 "Masukkan frasa laluan anda untuk membuka storan berterusan"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Buka Semula Storan Berterusan"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "Storan berterusan anda tidak berkunci. Mulakan semula Tails untuk menguncinya semula."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "Tetapan _Tambahan"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Simpan Tetapan Tambahan"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Tambah satu tetapan tambahan"
-
-#: 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 "Konfigurasi Rangkaian"
-
-#: 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 "Sekiranya sambungan Internet anda ditapis atau dikenakan proksi anda boleh konfigur satu titi Tor atau proksi setempat. Untuk sepenuhnya berfungsi secara luar talian, anda boleh lumpuhkan semua perangkaian."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Sambung terus ke rangkaian Tor (lalai)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Konfigur titi Tor atau proksi setempat"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Lumpuhkan semua perangkaian"
-
-#: 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 "Tetapan lalai adalah selamat dalam semua keadaan. Untuk menambah satu tetapan suai, tekan butang \"+\" di bawah."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "Kata _Laluan Pentadbiran"
-
-#: 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 "Mati (lalai)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "Perdayaan Alamat _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 "Hidup (lalai)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "Sambungan _Rangkaian"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "Penyamaran _Windows"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Hidup"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Mati"
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -713,6 +527,11 @@ msgstr "Sediakan satu kata laluan untuk membuka skrin."
 msgid "Password"
 msgstr "Kata Laluan"
 
+#: 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 "Sahkan"
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr "Versi Tails ini diketahui mempunyai beberapa masalah:"
@@ -809,35 +628,35 @@ msgstr "Buka Litar 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 "Volum {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} (Baca-Sahaja)"
 
 #. 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} di dalam {container_path}"
@@ -846,14 +665,14 @@ msgstr "{partition_name} di dalam {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} di dalam {drive_name}"
@@ -862,42 +681,42 @@ msgstr "{partition_name} di dalam {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 "Frasa laluan atau parameter salah"
 
-#: 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 "Ralat membuka volum"
 
 #. 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 "Tidak dapat membuka volum {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 ""
 
@@ -1095,6 +914,130 @@ msgid ""
 " ($(command_line))"
 msgstr "Pengesahihan diperlukan untuk membuang satu pakej daripada perisian tambahan anda ($(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 "Kata Laluan Pentadbiran"
+
+#: ../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 "Sediakan satu kata laluan pentadbiran jika anda perlu lakukan tugas-tugas pentadbir. Jika sebaliknya, kata laluan pentadbiran dilumpuhkan atas sebab keselamatan."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Masukkan kata laluan pentadbiran"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Sahkan kata laluan pentadbiran anda"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Lumpuhkan"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "Perdayaan Alamat 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 "Perdayaan alamat MAC menyembunyikan nombor siri antaramuka rangkaian anda (Wi-Fi atau berwayar) kepada rangkaian setempat. Perdayaan alamat MAC biasa lebih selamat kerana ia dapat membantu anda sembunyikan lokasi geografi anda. Tetapi ia mungkin menyebabkan masalah sambungan atau akan menimbulkan syak wasangka."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Perdaya semua alamat MAC (lalai)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "Jangan perdaya alamat-alamat MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Konfigurasi Rangkaian"
+
+#: ../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 "Sekiranya sambungan Internet anda ditapis atau dikenakan proksi anda boleh konfigur satu titi Tor atau proksi setempat. Untuk sepenuhnya berfungsi secara luar talian, anda boleh lumpuhkan semua perangkaian."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Sambung terus ke rangkaian Tor (lalai)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Konfigur titi Tor atau proksi setempat"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Lumpuhkan semua perangkaian"
+
+#: ../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 "Anda akan konfigur titi Tor dan proksi setempat kemudian selepas bersambung dengan rangkaian."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Selamat datang ke Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Bahasa & Wilayah"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Tetapan Lalai"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Storan _Berterusan Tersulit"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Konfigur Storan Berterusan"
+
+#. The label 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 "Masukkan frasa laluan anda untuk membuka storan berterusan"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Buka Semula Storan Berterusan"
+
+#: ../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 "Storan berterusan anda tidak berkunci. Mulakan semula Tails untuk menguncinya semula."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "Tetapan _Tambahan"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Tambah satu tetapan tambahan"
+
+#: ../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 "Tetapan lalai adalah selamat dalam semua keadaan. Untuk menambah satu tetapan suai, tekan butang \"+\" di bawah."
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "Bekas Fail"
diff --git a/my.po b/my.po
index 235d17591..b01187232 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"
-msgstr ""
+#: 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"
-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: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/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"
-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/gui.py:617
-msgid "Back"
-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/gui.py:731
+#: 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 ""
 
-#. 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"
@@ -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 18fc6ee71..14b74304b 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 "_Start"
 msgid "_Exit"
 msgstr "_Avslutt"
 
-#: 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 "Direkte (forvalg)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Bro og mellomtjener"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Frakoblet"
-
-#: 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 "LÃ¥s opp"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Klarte ikke Ã¥ lÃ¥se vedvarende lagring igjen."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
-msgstr "LÃ¥ser oppâ?¦"
-
-#: 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 "Kan ikke lÃ¥se opp kryptert lagring med denne passordsekvensen."
-
-#: 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 "Ytterligere innstillinger"
 
-#: 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 "Avbryt"
 
-#: 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 "Legg til"
 
-#: 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 "Tilbake"
 
-#: 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 "_Administrasjonspassord"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "Simulering av _MAC-adresse"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_Nettverkstilkobling"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Direkte (forvalg)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Bro og mellomtjener"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Frakoblet"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "PÃ¥ (forvalg)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Av"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "PÃ¥"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Av (forvalg)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "Skru av"
 
-#: 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 "_Start 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 "forvalg:VTH"
-
-#: 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 mislyktes med returkode {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"
@@ -189,7 +191,7 @@ msgid ""
 "{stderr}"
 msgstr "cryptsetup mislyktes med returkode {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"
@@ -197,7 +199,7 @@ msgid ""
 "{stderr}"
 msgstr "live-persist mislyktes med returkode {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"
@@ -205,225 +207,37 @@ msgid ""
 "{stderr}"
 msgstr "umount mislyktes med returkode {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 "Administrasjonspassord"
-
-#: 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 "Sett opp et administrasjonspassord hvis du trenger Ã¥ utfÃ¸re administrative oppgaver. Ellers er administrasjonspassordet avslÃ¥tt for bedret sikkerhet."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Skriv inn et administrasjonspassord"
-
-#: 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 "Bekreft"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Bekreft ditt administrasjonspassord"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Skru av"
-
-#. 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-kamuflasje"
-
-#. 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 "Dette valget gjÃ¸r at Tails ettaper Microsoft Windows 10. Dette kan vÃ¦re nyttig i det offentlige rom for Ã¥ unngÃ¥ Ã¥ tiltrekke seg mistanke."
-
-#. 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-kamuflasje"
-
-#: 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 "Simuler MAC-adresse"
-
-#: 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 "Simulering av MAC-adresser skjuler serienummeret tilhÃ¸rende ditt nettverksgrensesnitt (Wi-Fi eller trÃ¥dbundet) for lokalnettverket. Simulering av MAC-adresser er i hovedsak sikrere siden det hjelper deg Ã¥ skjule din geografiske plassering. Men det kan ogsÃ¥ forÃ¥rsake tilkoblingsproblemer eller se mistenkelig ut."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Simuler alle MAC-adresser (forvalg)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "Ikke simuler MAC-adresser"
-
-#: 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 "Du vil sette opp Tor-broen og lokal mellomtjener senere etter Ã¥ ha koblet til et nettverk."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Velkommen til 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 "For Ã¥ bli veiledet gjennom innstillinger i Tails, klikk <b>Ã?pne veiledning</b> ovenfor"
+#: 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 "LÃ¥s opp"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "SprÃ¥k og region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Klarte ikke Ã¥ lÃ¥se vedvarende lagring igjen."
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Forvalgte innstillinger"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
+msgstr "LÃ¥ser oppâ?¦"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Lagre sprÃ¥k- og regions -innstillinger"
+#: 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 "Kan ikke lÃ¥se opp kryptert lagring med denne passordsekvensen."
 
-#: 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 "_SprÃ¥k"
 
-#: 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 "_Tastaturoppsett"
 
-#: 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 "_Formater"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Tidssone"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Kryptert _vedvarende lagring"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Vis passordsekvens"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Sett opp vedvarende lagring"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "Skriv inn din passordsekvens for Ã¥ lÃ¥se opp det vedvarende lageret"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "LÃ¥s vedvarende lagring igjen"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "Ditt vedvarende lager er lÃ¥st opp. En omstart av Tails vil lÃ¥se det igjen."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_Ytterligere innstillinger"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Lagre ytterligere innstillinger"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Legg til ytterligere innstilling"
-
-#: 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 "Nettverksoppsett"
-
-#: 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 "Hvis denne datamaskinens internettforbindelse er sensurert, filtrert eller gÃ¥r via en mellomtjener, kan du sette opp en Tor-bro, eller lokal mellomtjener. For Ã¥ jobbe helt frakoblet, kan du skru av all nettverkstilknytning."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Koble direkte til Tor-nettverket (forvalg)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Sett opp en Tor-bro eller lokal mellomtjener"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Skru av alle nettverk"
-
-#: 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 "De forvalgte innstillingene er trygg i de fleste fall. For Ã¥ legge til en egendefinert innstilling, trykk \"+\"-knappen nedenfor."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Administrasjonspassord"
-
-#: 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 "Av (forvalg)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "Simulering av _MAC-adresse"
-
-#: 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 "PÃ¥ (forvalg)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_Nettverkstilkobling"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Windows-kamuflasje"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Av"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "PÃ¥"
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -722,6 +536,11 @@ msgstr "Sett opp et passord for Ã¥ lÃ¥se opp skjermen."
 msgid "Password"
 msgstr "Passord"
 
+#: 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 "Bekreft"
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr "Denne versjonen av Tails har kjente sikkerhetsproblem:"
@@ -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 "Feil ved opplÃ¥sing av volum"
 
 #. 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 "Administrasjonspassord"
+
+#: ../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 "Sett opp et administrasjonspassord hvis du trenger Ã¥ utfÃ¸re administrative oppgaver. Ellers er administrasjonspassordet avslÃ¥tt for bedret sikkerhet."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Skriv inn et administrasjonspassord"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Bekreft ditt administrasjonspassord"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Skru av"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "Simuler MAC-adresse"
+
+#: ../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 "Simulering av MAC-adresser skjuler serienummeret tilhÃ¸rende ditt nettverksgrensesnitt (Wi-Fi eller trÃ¥dbundet) for lokalnettverket. Simulering av MAC-adresser er i hovedsak sikrere siden det hjelper deg Ã¥ skjule din geografiske plassering. Men det kan ogsÃ¥ forÃ¥rsake tilkoblingsproblemer eller se mistenkelig ut."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Simuler alle MAC-adresser (forvalg)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "Ikke simuler MAC-adresser"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Nettverksoppsett"
+
+#: ../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 "Hvis denne datamaskinens internettforbindelse er sensurert, filtrert eller gÃ¥r via en mellomtjener, kan du sette opp en Tor-bro, eller lokal mellomtjener. For Ã¥ jobbe helt frakoblet, kan du skru av all nettverkstilknytning."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Koble direkte til Tor-nettverket (forvalg)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Sett opp en Tor-bro eller lokal mellomtjener"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Skru av alle nettverk"
+
+#: ../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 "Du vil sette opp Tor-broen og lokal mellomtjener senere etter Ã¥ ha koblet til et nettverk."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Velkommen til Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "SprÃ¥k og region"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Forvalgte innstillinger"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Kryptert _vedvarende lagring"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Sett opp vedvarende lagring"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "Skriv inn din passordsekvens for Ã¥ lÃ¥se opp det vedvarende lageret"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "LÃ¥s vedvarende lagring igjen"
+
+#: ../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 "Ditt vedvarende lager er lÃ¥st opp. En omstart av Tails vil lÃ¥se det igjen."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_Ytterligere innstillinger"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Legg til ytterligere innstilling"
+
+#: ../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 "De forvalgte innstillingene er trygg i de fleste fall. For Ã¥ legge til en egendefinert innstilling, trykk \"+\"-knappen nedenfor."
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "Filbeholdere"
diff --git a/ne.po b/ne.po
index 570db6aa5..49cadf765 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 "Cancel"
+
+#: 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"
+#: 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/ui/additional_settings.py:274
+msgid "Off"
 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:276
+msgid "Off (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: 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"
@@ -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 0093e36bf..558d8f83f 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 "_Afsluiten"
 
-#: 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 "Rechtstreeks (standaard)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Bridge & 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 "Ontgrendelen"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Opnieuw vergrendelen van permanente opslag mislukt."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
-msgstr "Ontgrendelenâ?¦"
-
-#: 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 "Kan versleutelde opslag niet ontgrendelen met deze wachtwoordzin."
-
-#: 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 "Extra instellingen"
 
-#: 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 "Annuleren"
 
-#: 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 "Toevoegen"
 
-#: 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 "Terug"
 
-#: 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 "_Beheerderswachtwoord"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_MAC-adresspoofing"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_Netwerkverbinding"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Rechtstreeks (standaard)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Bridge & 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 "Aan (standaard)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Aan"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Uit"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Uit (standaard)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "Uitschakelen"
 
-#: 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 _starten"
 
-#. 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 mislukt met retourcode {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"
@@ -203,7 +205,7 @@ msgid ""
 "{stderr}"
 msgstr "cryptsetup mislukt met retourcode {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"
@@ -211,7 +213,7 @@ msgid ""
 "{stderr}"
 msgstr "live-persist mislukt met retourcode {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"
@@ -219,225 +221,37 @@ msgid ""
 "{stderr}"
 msgstr "unmount mislukt met retourcode {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 "Beheerderswachtwoord"
-
-#: 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 "Stel een beheerderswachtwoord in als u beheertaken moet uitvoeren. Als dat niet zo is, wordt het wachtwoord uitgeschakeld omwille van betere beveiliging."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Voer een beheerderswachtwoord in."
-
-#: 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 "Bevestigen"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Bevestig uw beheerderswachtwoord"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Uitschakelen"
-
-#. 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-camouflage"
-
-#. 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 "Deze optie laat Tails meer op Microsoft Windows 10 lijken. Dit kan handig zijn om minder argwaan op te wekken op openbare locaties."
-
-#. 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-camouflage"
-
-#: 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-adresspoofing"
-
-#: 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-adresspoofing verbergt het serienummer van uw netwerkkaart (wifi of kabel) op het lokale netwerk. Het spoofen van MAC-adressen is meestal veiliger, aangezien dit uw geografische locatie helpt verbergen. Het kan echter ook verbindingsproblemen met zich meebrengen of er verdacht uitzien."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Alle MAC-adressen spoofen (standaard)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "MAC-adressen niet spoofen"
-
-#: 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 "De Tor-bridge en lokale proxy stelt u later in nadat u verbinding met een netwerk hebt gemaakt."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Welkom bij 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 "Klik hierboven op <b>Rondleiding starten</b> om de rondleiding door de instellingen van Tails te volgen."
+#: 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 "Ontgrendelen"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Taal & regio"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Opnieuw vergrendelen van permanente opslag mislukt."
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Standaardinstellingen"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
+msgstr "Ontgrendelenâ?¦"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Taal- en regio-instellingen opslaan"
+#: 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 "Kan versleutelde opslag niet ontgrendelen met deze wachtwoordzin."
 
-#: 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 "Taa_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 "Toetsen_bordindeling"
 
-#: 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 "I_ndelingen"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Tijdzone"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Versleutelde _permanente opslag"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Wachtwoordzin tonen"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Permanente opslag configureren"
-
-#. 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 "Voer uw wachtwoordzin in om de permanente opslag te ontgrendelen"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Permanente opslag opnieuw vergrendelen"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "Uw permanente opslag is ontgrendeld. Herstart Tails om de opslag opnieuw te vergrendelen."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "Extr_a instellingen"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Extra instellingen opslaan"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Extra instelling toevoegen"
-
-#: 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 "Netwerkconfiguratie"
-
-#: 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 "Als uw internetverbinding wordt gecensureerd, gefilterd of via een proxy verloopt, kunt u een Tor-bridge of lokale proxy configureren. Om helemaal offline te werken, kunt u alle netwerken uitschakelen."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Rechtstreeks met het Tor-netwerk verbinden (standaard)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Een Tor-bridge of lokale proxy configureren"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Alle netwerken uitschakelen"
-
-#: 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 "De standaardinstellingen zijn veilig in de meeste situaties. Klik op de â??+â??-knop hieronder om een aangepaste instelling toe te voegen."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Beheerderswachtwoord"
-
-#: 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 "Uit (standaard)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_MAC-adresspoofing"
-
-#: 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 "Aan (standaard)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_Netwerkverbinding"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Windows-camouflage"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Aan"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Uit"
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -736,6 +550,11 @@ msgstr "Stel een wachtwoord in om het scherm te ontgrendelen."
 msgid "Password"
 msgstr "Wachtwoord"
 
+#: 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 "Bevestigen"
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr "Deze versie van Tails heeft bekende beveiligings-problemen:"
@@ -832,35 +651,35 @@ msgstr "Onion-circuits openen"
 
 #. 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} (Alleen-lezen)"
 
 #. 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}"
@@ -869,14 +688,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} op {drive_name}"
@@ -885,42 +704,42 @@ msgstr "{partition_name} op {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 "Onjuiste wachtwoordzin of parameters"
 
-#: 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 "Fout bij ontgrendelen van 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 "Kon volume {volume_name}:\n{error_message} niet ontgrendelen"
 
-#: 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 "Een of meer toepassingen houden het volume bezet."
 
 #. 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 "Kon volume {volume_name} niet vergrendelen:\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 "Vergrendelen van het volume mislukt"
 
@@ -1118,6 +937,130 @@ msgid ""
 " ($(command_line))"
 msgstr "Er is authenticatie vereist om een pakket uit uw extra software te verwijderen ($(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 "Beheerderswachtwoord"
+
+#: ../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 "Stel een beheerderswachtwoord in als u beheertaken moet uitvoeren. Als dat niet zo is, wordt het wachtwoord uitgeschakeld omwille van betere beveiliging."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Voer een beheerderswachtwoord in."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Bevestig uw beheerderswachtwoord"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Uitschakelen"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "MAC-adresspoofing"
+
+#: ../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-adresspoofing verbergt het serienummer van uw netwerkkaart (wifi of kabel) op het lokale netwerk. Het spoofen van MAC-adressen is meestal veiliger, aangezien dit uw geografische locatie helpt verbergen. Het kan echter ook verbindingsproblemen met zich meebrengen of er verdacht uitzien."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Alle MAC-adressen spoofen (standaard)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "MAC-adressen niet spoofen"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Netwerkconfiguratie"
+
+#: ../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 "Als uw internetverbinding wordt gecensureerd, gefilterd of via een proxy verloopt, kunt u een Tor-bridge of lokale proxy configureren. Om helemaal offline te werken, kunt u alle netwerken uitschakelen."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Rechtstreeks met het Tor-netwerk verbinden (standaard)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Een Tor-bridge of lokale proxy configureren"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Alle netwerken uitschakelen"
+
+#: ../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 "De Tor-bridge en lokale proxy stelt u later in nadat u verbinding met een netwerk hebt gemaakt."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Welkom bij Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Taal & regio"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Standaardinstellingen"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Versleutelde _permanente opslag"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Permanente opslag configureren"
+
+#. The label 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 "Voer uw wachtwoordzin in om de permanente opslag te ontgrendelen"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Permanente opslag opnieuw vergrendelen"
+
+#: ../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 "Uw permanente opslag is ontgrendeld. Herstart Tails om de opslag opnieuw te vergrendelen."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "Extr_a instellingen"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Extra instelling toevoegen"
+
+#: ../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 "De standaardinstellingen zijn veilig in de meeste situaties. Klik op de â??+â??-knop hieronder om een aangepaste instelling toe te voegen."
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "Bestandscontainers"
diff --git a/nl_BE.po b/nl_BE.po
index 54ca5fb92..60daa3421 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)"
-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 "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 "Ontgrendelen"
-
-#: 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 "Bezig met ontgrendelenâ?¦"
-
-#: 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 "Annuleer"
 
-#: 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 "Toevoegen"
 
-#: 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 "Terug"
 
-#: 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 ""
 
-#: 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: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 ""
+
+#: 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 ""
 
-#. 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:272
+msgid "On"
+msgstr "Aan"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Uit"
+
+#: 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/persistence.py:91
+#: 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/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 "Bevestigen"
-
-#: 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 "Uitschakelen"
-
-#. 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"
-msgstr ""
+#: 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 "Ontgrendelen"
 
-#: 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"
-msgstr ""
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
+msgstr "Bezig met ontgrendelenâ?¦"
 
-#: 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 "Aan"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Uit"
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -711,6 +525,11 @@ msgstr ""
 msgid "Password"
 msgstr "Wachtwoord"
 
+#: 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 "Bevestigen"
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr "Deze versie van Tails heeft gekende beveiligingsproblemen:"
@@ -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 "Uitschakelen"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in: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 565971de3..7338d0231 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 "_Start"
 msgid "_Exit"
 msgstr "_Avslutt"
 
-#: 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 "Direkte (standard)"
-
-#: 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 "FrÃ¥kopla"
-
-#: 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 "Fjern blokkering"
-
-#: 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 "Fjernar blokkering"
-
-#: 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 "Tillegsinnstillingar"
 
-#: 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 "Avbrjot"
 
-#: 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 "Legg til"
 
-#: 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 "Tilbake"
 
-#: 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 ""
+
+#: 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 "Direkte (standard)"
+
+#: 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 "FrÃ¥kopla"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "PÃ¥ (standard)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "PÃ¥"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Av"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Av (standard)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: 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"
@@ -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 "Adminiistrasjonspassord"
-
-#: 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 "Skriv inn eit admin-passord"
-
-#: 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 "Stadfest"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Stadfest admin-passordet ditt"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "SlÃ¥ av"
-
-#. 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 Camouflage"
-
-#. 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 "Velkomen til Tails!"
+#: 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 "Fjern blokkering"
 
-#. 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:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "SprÃ¥k og region"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Standard-innstillingar"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
+msgstr "Fjernar blokkering"
 
-#: 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 "Vis passord"
-
-#: 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 "Nettverksoppsett"
-
-#: 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 "SlÃ¥ av alle nettverksfunksjonar"
-
-#: 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 "Av (standard)"
-
-#: 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 "PÃ¥ (standard)"
-
-#: 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 "PÃ¥"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Av"
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -711,6 +525,11 @@ msgstr ""
 msgid "Password"
 msgstr "Passord"
 
+#: 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 "Stadfest"
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr "Denne versjonen av Halar hev kjende tryggleiksproblem:"
@@ -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 "Adminiistrasjonspassord"
+
+#: ../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 "Skriv inn eit admin-passord"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Stadfest admin-passordet ditt"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "SlÃ¥ av"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in: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 "Nettverksoppsett"
+
+#: ../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 "SlÃ¥ av alle nettverksfunksjonar"
+
+#: ../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 "Velkomen til Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "SprÃ¥k og region"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Standard-innstillingar"
+
+#: ../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 394bc0ce2..bcdf7cbca 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"
-msgstr ""
+#: 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"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "FÃ²ra linha"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
+msgstr "Apondre"
 
-#: 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 "Precedent"
+
+#: 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"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "FÃ²ra linha"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
-msgstr "Apondre"
+#: 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"
-msgstr "Precedent"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "I"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "O"
+
+#: 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/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: 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"
@@ -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 "I"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "O"
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -709,6 +523,11 @@ msgstr ""
 msgid "Password"
 msgstr "Senhal"
 
+#: 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 2bf9bd099..8ae777cbf 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 "Cancel"
+
+#: 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"
+#: 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/ui/additional_settings.py:274
+msgid "Off"
 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:276
+msgid "Off (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: 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"
@@ -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 8c08ff6cf..f9ec81c34 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 "à¨?à¨²à¨¾à¨?(_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)"
+#: 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/ui/add_settings_dialog.py:54
+msgid "Back"
 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/additional_settings.py:56
+msgid "_Administration Password"
 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:156
+msgid "_MAC Address Spoofing"
 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:206
+msgid "_Network Connection"
 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:215
+msgid "Direct (default)"
 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:217
+msgid "Bridge & Proxy"
 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:219
+msgid "Offline"
 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:270
+msgid "On (default)"
+msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
-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/gui.py:617
-msgid "Back"
+#: 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/gui.py:731
+#: 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 ""
 
-#. 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"
@@ -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 5e37475e1..80d17dd32 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 "_Uruchom"
 msgid "_Exit"
 msgstr "_WyjÅ?cie"
 
-#: 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 "PoÅ?Ä?cz (domyÅ?lny)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Mostek i Proxy"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Poza zasiÄ?giem"
-
-#: 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 "Odblokuj"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Nie udaÅ?o siÄ? ponownie zablokowaÄ? PamiÄ?ci TrwaÅ?ej."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
-msgstr "Odblokowanie ..."
-
-#: 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 "Nie moÅ¼na odblokowaÄ? zaszyfrowanej pamiÄ?ci z tym hasÅ?em."
-
-#: 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 "Dodatkowe Ustawienia"
 
-#: 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 "Anuluj"
 
-#: 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 "Dodaj"
 
-#: 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 "Wstecz"
 
-#: 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 "_HasÅ?o Administracyjne"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_Spoofowanie adresÃ³w MAC"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_PoÅ?Ä?czenie Sieciowe"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "PoÅ?Ä?cz (domyÅ?lny)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Mostek i Proxy"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Poza zasiÄ?giem"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "WÅ?Ä?czony (domyÅ?lny)"
+
+#: 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 "WyÅ?Ä?czony (domyÅ?lny)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "WyÅ?Ä?czenie"
 
-#: 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 "_Uruchom 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 "domyÅ?lnie: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 zakoÅ?czyÅ? siÄ? bÅ?Ä?dem z kodem {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"
@@ -193,7 +195,7 @@ msgid ""
 "{stderr}"
 msgstr "cryptsetup zakoÅ?czyÅ? siÄ? bÅ?Ä?dem z kodem {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"
@@ -201,7 +203,7 @@ msgid ""
 "{stderr}"
 msgstr "live-persist nie powiodÅ?o siÄ? z kodem powrotnym {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"
@@ -209,225 +211,37 @@ msgid ""
 "{stderr}"
 msgstr "umount zakoÅ?czyÅ? siÄ? bÅ?Ä?dem z kodem {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 "HasÅ?o Administracyjne"
-
-#: 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 "Ustaw hasÅ?o administracyjne jeÅ?li bÄ?dziesz musiaÅ? wykonywaÄ? zadania administracyjne. W innym przypadku hasÅ?o administracyjne zostanie wyÅ?Ä?czone dla wiÄ?kszego bezpieczeÅ?stwa."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "WprowadÅº hasÅ?o administracyjne"
-
-#: 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 "PotwierdÅº"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "PotwierdÅº swoje hasÅ?o administracyjne"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "WyÅ?Ä?cz"
-
-#. 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 "KamuflaÅ¼ 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 "Ta opcja zamienia interfejs Tails-a na podobny do Microsoft Windows 10. MoÅ¼e pomÃ³c Ci uniknÄ?Ä? podejrzeÅ? i ich przyciÄ?gania w miejscach publicznych."
-
-#. 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 "KamuflaÅ¼ 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 "FaÅ?szowanie Adresu 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 "FaÅ?szowanie adresu MAC ukrywa number seryjny Twojej karty sieciowej lub kart sieciowych (Wi-Fi lub poÅ?Ä?czenie przewodowe) przed lokalnymi sieciami. FaÅ?szowanie adresu MAC powoduje Ciebie bezpieczniejszym i pomaga ukryÄ? Twoje poÅ?oÅ¼enie geograficzne, ale moÅ¼e rÃ³wnieÅ¼ powodowaÄ? problemy z sieciÄ? lub podejrzenia."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "FaÅ?szuj wszystkie adresy MAC (domyÅ?lne)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "Nie faÅ?szuj adresu 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 "MoÅ¼esz skonfigurowaÄ? ustawienia mostka i lokalne proxy po wczeÅ?niejszym poÅ?Ä?czeniu z sieciÄ?."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Witaj w 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 "Aby zostaÄ? przeprowadzony przez ustawienia Tails kliknij na <b>Przewodnik</b> powyÅ¼ej"
+#: 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 "Odblokuj"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "JÄ?zyk i Lokalizacja"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Nie udaÅ?o siÄ? ponownie zablokowaÄ? PamiÄ?ci TrwaÅ?ej."
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Ustawienia DomyÅ?lne"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
+msgstr "Odblokowanie ..."
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Zapisz ustawienia JÄ?zyka i Lokalizacji"
+#: 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 "Nie moÅ¼na odblokowaÄ? zaszyfrowanej pamiÄ?ci z tym hasÅ?em."
 
-#: 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 "_JÄ?zyk"
 
-#: 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 "_UkÅ?ad Klawiatury"
 
-#: 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 "_Formaty"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Strefa Czasowa"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Zaszyfrowany _PamiÄ?Ä? TrwaÅ?a"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "PokaÅ¼ HasÅ?o"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Skonfiguruj PamiÄ?Ä? TrwaÅ?Ä?"
-
-#. 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 "Wpisz Twoje hasÅ?o do odblokowania przechowania danych"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Ponownie zablokuj PamiÄ?Ä? TrwaÅ?Ä?"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "Twoja pamiÄ?Ä? trwaÅ?a jest odblokowana. Zrestartuj Tails aby zablokowaÄ? jÄ? ponownie."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_Dodatkowe Ustawienia"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Zapisz Dodatkowe Ustawienia"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Dodaj dodatkowe ustawienie"
-
-#: 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 "Konfiguracja Sieci"
-
-#: 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 "JeÅ?li poÅ?Ä?czenie internetowe tego komputera jest ocenzurowane, filtrowane lub przepuszczane przez proxy.MoÅ¼esz skonfigurowaÄ? most lub ustawienia proxy. Do caÅ?kowitej pracy offline, moÅ¼esz wyÅ?Ä?czyÄ? wszystkie sieci."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "PoÅ?Ä?cz bezpoÅ?rednio do Sieci Tor (domyÅ?lne)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Skonfiguruj mostek Tor lub lokalny serwer proxy"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "WyÅ?Ä?cz wszystkie poÅ?Ä?czenia sieciowe"
-
-#: 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 "Ustawienia domyÅ?lne sÄ? bezpieczne w wiÄ?kszoÅ?ci sytuacji. Aby dodaÄ? wÅ?asne ustawienie , kliknij \"+\" poniÅ¼ej."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_HasÅ?o Administracyjne"
-
-#: 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 "WyÅ?Ä?czony (domyÅ?lny)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_Spoofowanie adresÃ³w 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 "WÅ?Ä?czony (domyÅ?lny)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_PoÅ?Ä?czenie Sieciowe"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Kamuflarz Okien"
-
-#: 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 ""
@@ -726,6 +540,11 @@ msgstr "Ustaw hasÅ?o aby odblokowaÄ? ekran."
 msgid "Password"
 msgstr "HasÅ?o"
 
+#: 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 "PotwierdÅº"
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr "Ta wersja Tails ma bÅ?Ä?dy bezpieczeÅ?stwa:"
@@ -822,35 +641,35 @@ msgstr "Otwarte Obwody 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} WielkoÅ?Ä?"
 
 #. 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} (Tylko do odczytu)"
 
 #. 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} w {container_path}"
@@ -859,14 +678,14 @@ msgstr "{partition_name} w {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} na {drive_name}"
@@ -875,42 +694,42 @@ msgstr "{partition_name} na {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 "NieprawidÅ?owe hasÅ?o lub parametry"
 
-#: 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 "BÅ?Ä?d odblokowywania woluminu"
 
 #. 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 "Nie moÅ¼na odblokowaÄ? woluminu {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 "Nie moÅ¼na zablokowaÄ? woluminu {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 ""
 
@@ -1108,6 +927,130 @@ msgid ""
 " ($(command_line))"
 msgstr "Aby usunÄ?Ä? paczkÄ? z twojego dodatkiwego oprogramowania ($(command_line)) wymagana jest autentykacja"
 
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../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 "HasÅ?o Administracyjne"
+
+#: ../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 "Ustaw hasÅ?o administracyjne jeÅ?li bÄ?dziesz musiaÅ? wykonywaÄ? zadania administracyjne. W innym przypadku hasÅ?o administracyjne zostanie wyÅ?Ä?czone dla wiÄ?kszego bezpieczeÅ?stwa."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "WprowadÅº hasÅ?o administracyjne"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "PotwierdÅº swoje hasÅ?o administracyjne"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "WyÅ?Ä?cz"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "FaÅ?szowanie Adresu 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 "FaÅ?szowanie adresu MAC ukrywa number seryjny Twojej karty sieciowej lub kart sieciowych (Wi-Fi lub poÅ?Ä?czenie przewodowe) przed lokalnymi sieciami. FaÅ?szowanie adresu MAC powoduje Ciebie bezpieczniejszym i pomaga ukryÄ? Twoje poÅ?oÅ¼enie geograficzne, ale moÅ¼e rÃ³wnieÅ¼ powodowaÄ? problemy z sieciÄ? lub podejrzenia."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "FaÅ?szuj wszystkie adresy MAC (domyÅ?lne)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "Nie faÅ?szuj adresu MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Konfiguracja Sieci"
+
+#: ../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 "JeÅ?li poÅ?Ä?czenie internetowe tego komputera jest ocenzurowane, filtrowane lub przepuszczane przez proxy.MoÅ¼esz skonfigurowaÄ? most lub ustawienia proxy. Do caÅ?kowitej pracy offline, moÅ¼esz wyÅ?Ä?czyÄ? wszystkie sieci."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "PoÅ?Ä?cz bezpoÅ?rednio do Sieci Tor (domyÅ?lne)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Skonfiguruj mostek Tor lub lokalny serwer proxy"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "WyÅ?Ä?cz wszystkie poÅ?Ä?czenia sieciowe"
+
+#: ../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 "MoÅ¼esz skonfigurowaÄ? ustawienia mostka i lokalne proxy po wczeÅ?niejszym poÅ?Ä?czeniu z sieciÄ?."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Witaj w Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "JÄ?zyk i Lokalizacja"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Ustawienia DomyÅ?lne"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Zaszyfrowany _PamiÄ?Ä? TrwaÅ?a"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Skonfiguruj PamiÄ?Ä? TrwaÅ?Ä?"
+
+#. The label 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 "Wpisz Twoje hasÅ?o do odblokowania przechowania danych"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Ponownie zablokuj PamiÄ?Ä? TrwaÅ?Ä?"
+
+#: ../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 "Twoja pamiÄ?Ä? trwaÅ?a jest odblokowana. Zrestartuj Tails aby zablokowaÄ? jÄ? ponownie."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_Dodatkowe Ustawienia"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Dodaj dodatkowe ustawienie"
+
+#: ../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 "Ustawienia domyÅ?lne sÄ? bezpieczne w wiÄ?kszoÅ?ci sytuacji. Aby dodaÄ? wÅ?asne ustawienie , kliknij \"+\" poniÅ¼ej."
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "Kontenery plikÃ³w"
diff --git a/pt_BR.po b/pt_BR.po
index fc2d32a4f..2646a1bf2 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 "Direta (padrÃ£o)"
-
-#: 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 "Adicionar"
 
-#: 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 "_Mascaragem de endereÃ§os MAC"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_ConexÃ£o de Rede"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Direta (padrÃ£o)"
+
+#: 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 "Ativar (padrÃ£o)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Ativar"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Desativar"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Desativar (padrÃ£o)"
+
+#: 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 "_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 nÃ£o conseguiu retornar o cÃ³digo {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"
@@ -201,7 +203,7 @@ msgid ""
 "{stderr}"
 msgstr "cryptsetup nÃ£o conseguiu retornar o cÃ³digo  {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"
@@ -209,7 +211,7 @@ msgid ""
 "{stderr}"
 msgstr "live-persist nÃ£o pÃ´de retornar o cÃ³digo {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"
@@ -217,225 +219,37 @@ msgid ""
 "{stderr}"
 msgstr "umount  nÃ£o pÃ´de retornar o cÃ³digo {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 "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 "Desativar (padrÃ£o)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_Mascaragem de endereÃ§os 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 "Ativar (padrÃ£o)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_ConexÃ£o de Rede"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Camuflagem Windows"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Ativar"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Desativar"
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -734,6 +548,11 @@ msgstr "Configure uma senha para desbloquear a tela"
 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 "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} 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} (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} em {container_path}"
@@ -867,14 +686,14 @@ msgstr "{partition_name} em {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} em {drive_name}"
@@ -883,42 +702,42 @@ msgstr "{partition_name} em {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 "Senha ou parÃ¢metros incorretos"
 
-#: 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 "Erro ao desbloquear o 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 "NÃ£o foi possÃvel desbloquear o 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 "Um ou mais aplicativos estÃ£o mantendo o volume 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 "NÃ£o foi possÃvel bloquear Â {volume_name}:{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 "Bloquear o volume falhou"
 
@@ -1116,6 +935,130 @@ msgid ""
 " ($(command_line))"
 msgstr "AutenticaÃ§Ã£o Ã© necessÃ¡ria para remover um pacote de seus softwares adicionais ($(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 "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 "Volumes para Armazenagem de Arquivos"
diff --git a/pt_PT.po b/pt_PT.po
index 6a8188783..644a8f099 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)"
-msgstr "Direto (predefiniÃ§Ã£o)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Ponte e Proxy"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Desligado"
-
-#: 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 "NÃ£o foi possÃvel voltar a bloquear o armazenamento permanente."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
-msgstr "A desbloquearâ?¦"
-
-#: 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 Ã© possÃvel desbloquear o armazenamento encriptado com esta frase-senha"
-
-#: 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 "Adicionar"
 
-#: 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 "Voltar"
 
-#: 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 "Palavra-passe de _AdministraÃ§Ã£o"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "Mascarar EndereÃ§o _MAC"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "LigaÃ§Ã£o de _Rede"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Direto (predefiniÃ§Ã£o)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Ponte e Proxy"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Desligado"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "Ativado (predefiniÃ§Ã£o)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Ativado"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Desativado"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Desativado (predefiniÃ§Ã£o)"
+
+#: 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 "_Iniciar o 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 "predefiniÃ§Ã£o: 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 falhou com o 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"
@@ -181,7 +183,7 @@ msgid ""
 "{stderr}"
 msgstr "cryptsetup com o 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"
@@ -189,7 +191,7 @@ msgid ""
 "{stderr}"
 msgstr "live-persist com o 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"
@@ -197,225 +199,37 @@ msgid ""
 "{stderr}"
 msgstr "umount com o 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 "Palavra-passe 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 palavra-passe de administrador se precisar de executar tarefas administrativas. Caso contrÃ¡rio, a palavra-passe de administrador Ã© desativada para uma melhor seguranÃ§a."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Insira uma palavra-passe 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 "Confirme a sua palavra-passe de administraÃ§Ã£o"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Desativar"
-
-#. 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 do 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 Tails seja parecido com o Microsoft Windows 10. Isto pode ser Ãºtil para evitar atrair suspeitas em locais 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 do 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 "Mascarar EndereÃ§o 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 "O mascarar de endereÃ§os MAC oculta o nÃºmero de sÃ©rie da sua interface de rede (com ou sem fios) para a rede local. Mascarar endereÃ§os MAC Ã© geralmente seguro porque ajuda-o a ocultar a sua localizaÃ§Ã£o geogrÃ¡fica. Mas esta pode tambÃ©m criar problemas de ligaÃ§Ã£o ou parecer suspeita."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Mascarar todos endereÃ§os MAC (predefiniÃ§Ã£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 "IrÃ¡ configurar a ponte do Tor e o proxy local mais tarde apÃ³s ligar-se a uma rede."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Bem-vindo 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 "Para ser guiado atravÃ©s das configuraÃ§Ãµes do Tails, clique em cima em <b>Ver Guia</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 e RegiÃ£o"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "NÃ£o foi possÃvel voltar a bloquear o armazenamento permanente."
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "ConfiguraÃ§Ãµes Predefinidas"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
+msgstr "A desbloquearâ?¦"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Guardar ConfiguraÃ§Ãµes do Idioma e 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 Ã© possÃvel desbloquear o armazenamento encriptado com esta frase-senha"
 
-#: 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 "DisposiÃ§Ã£o do _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 "_Fuso HorÃ¡rio"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Armazenamento _Permanente Encriptado"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Mostrar Frase-Senha"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Configurar Armazenamento Permanente"
-
-#. 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 "Insira a sua frase-senha para desbloquear o armazenamento permanente"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Voltar a bloquear o Armazenamento Permanente"
-
-#: 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 armazenamento permanente encontra-se desbloqueado. Reinicie o 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 "Guardar 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 ligaÃ§Ã£o Ã  Internet estÃ¡ censurada, filtrada ou com proxy, pode configurar uma ponte Tor ou um proxy local. Para funcionar completamente desligado, pode desativar toda a rede."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Ligar diretamente Ã  rede Tor (predefiniÃ§Ã£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 definiÃ§Ãµes de proxy"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Desativar toda a 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 predefinidas sÃ£o seguras na maioria das situaÃ§Ãµes. Para adicionar uma definiÃ§Ã£o personalizada, pressione no botÃ£o abaixo \"+\"."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "Palavra-passe 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 "Desativado (predefiniÃ§Ã£o)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "Mascarar EndereÃ§o _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 "Ativado (predefiniÃ§Ã£o)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "LigaÃ§Ã£o de _Rede"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "Camuflagem do _Windows"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Ativado"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Desativado"
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -714,6 +528,11 @@ msgstr "Configure uma palavra-passe para desbloquear o ecrÃ£."
 msgid "Password"
 msgstr "Palavra-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 "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 alguns problemas de seguranÃ§a conhecidos:"
@@ -810,35 +629,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} 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} (apenas leitura)"
 
 #. 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} em {container_path}"
@@ -847,14 +666,14 @@ msgstr "{partition_name} em {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} em {drive_name}"
@@ -863,42 +682,42 @@ msgstr "{partition_name} em {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-senha ou parÃ¢metros incorretos"
 
-#: 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 "Erro ao desbloquear o 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 "NÃ£o foi possÃvel desbloquear o 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 "Uma ou mais aplicaÃ§Ãµes estÃ¡ a manter o dispositivo 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 "NÃ£o foi possÃvel bloquear o disco {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 "Bloquear este dispositivo falhou."
 
@@ -1096,6 +915,130 @@ msgid ""
 " ($(command_line))"
 msgstr "Ã? necessÃ¡ria a autenticaÃ§Ã£o para remover um pacote dos seus programas adicionais ($(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 "Palavra-passe 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 palavra-passe de administrador se precisar de executar tarefas administrativas. Caso contrÃ¡rio, a palavra-passe de administrador Ã© desativada para uma melhor seguranÃ§a."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Insira uma palavra-passe de administraÃ§Ã£o"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Confirme a sua palavra-passe de administraÃ§Ã£o"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Desativar"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "Mascarar EndereÃ§o 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 "O mascarar de endereÃ§os MAC oculta o nÃºmero de sÃ©rie da sua interface de rede (com ou sem fios) para a rede local. Mascarar endereÃ§os MAC Ã© geralmente seguro porque ajuda-o a ocultar a sua localizaÃ§Ã£o geogrÃ¡fica. Mas esta pode tambÃ©m criar problemas de ligaÃ§Ã£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 endereÃ§os MAC (predefiniÃ§Ã£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 ligaÃ§Ã£o Ã  Internet estÃ¡ censurada, filtrada ou com proxy, pode configurar uma ponte Tor ou um proxy local. Para funcionar completamente desligado, pode desativar toda a rede."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Ligar diretamente Ã  rede Tor (predefiniÃ§Ã£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 definiÃ§Ãµes de proxy"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Desativar toda a 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 "IrÃ¡ configurar a ponte do Tor e o proxy local mais tarde apÃ³s ligar-se a uma rede."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Bem-vindo ao Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Idioma e RegiÃ£o"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "ConfiguraÃ§Ãµes Predefinidas"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Armazenamento _Permanente Encriptado"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Configurar Armazenamento Permanente"
+
+#. The label 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 "Insira a sua frase-senha para desbloquear o armazenamento permanente"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Voltar a bloquear o Armazenamento Permanente"
+
+#: ../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 armazenamento permanente encontra-se desbloqueado. Reinicie o 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 predefinidas sÃ£o seguras na maioria das situaÃ§Ãµes. Para adicionar uma definiÃ§Ã£o personalizada, pressione no botÃ£o abaixo \"+\"."
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "Volumes de Ficheiros"
diff --git a/ro.po b/ro.po
index f345b42cc..98c13b1fb 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)"
-msgstr "Direct (implicit)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Punte È?i Proxy"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Deconectat"
-
-#: 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 "DeblocaÅ£i"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Reblocarea mediului de stocare persistent a eÈ?uat. "
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
-msgstr "Se deblocheazÄ?..."
-
-#: 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 "Deblocare imposibilÄ? a dispozitivului de stocare criptat cu aceastÄ? parolÄ?."
-
-#: 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 "SetÄ?ri adiÈ?ionale"
 
-#: 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 "Anulare"
 
-#: 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 "AdaugÄ?"
 
-#: 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 "Ã?napoi"
 
-#: 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 "_ParolÄ? administrare"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_Falsificare adresÄ? MAC  "
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_Conexiune reÈ?ea"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Direct (implicit)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Punte È?i Proxy"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Deconectat"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "Activat (implicit)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Activat"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Dezactivat"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Dezactivat (implicit)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "Inchide"
 
-#: 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 "_PorneÈ?te 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 "implicit: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 a eÈ?uat returnÃ¢nd eroarea {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"
@@ -194,7 +196,7 @@ msgid ""
 "{stderr}"
 msgstr "cryptsetup a eÈ?uat returnÃ¢nd eroarea {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"
@@ -202,7 +204,7 @@ msgid ""
 "{stderr}"
 msgstr "live-persist a eÈ?uat returnÃ¢nd eroarea {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"
@@ -210,225 +212,37 @@ msgid ""
 "{stderr}"
 msgstr "umount a eÈ?uat returnÃ¢nd eroarea {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 "ParolÄ? administrare"
-
-#: 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 "SetaÅ£i o parolÄ? de administrare pentru operaÈ?iuni administrative. Altfel, parola de administrare va fi dezactivatÄ? pentru securitate sporitÄ?."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "IntroduceÅ£i o parolÄ? de administrare"
-
-#: 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 "ConfimaÅ£i parola de administrare"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "DezactivaÅ£i"
-
-#. 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 "Camuflare 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 "AceastÄ? opÈ?iune face ca Tails sÄ? semene mai mult cu Microsoft Windows 10. Acest lucru poate fi util Ã®n locuri publice pentru a evita suspiciunile."
-
-#. 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 "Camuflare 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 "Falsificare adresÄ? 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 "\"Spoofing\"-ul adresei MAC  ascunde numÄ?rul serial al interfeÈ?ei de reÈ?ea (Wi-Fi sau prin cablu) cÄ?tre reÈ?eaua localÄ?. Acest lucru este Ã®n general mai sigur deoarece ajutÄ? la ascunderea geolocaÈ?iei. TotuÈ?i este posibil sÄ? creeze probleme de conectivitate sau sÄ? ridice suspiciuni. "
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "FalsificÄ? toate adresele MAC (implicit)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "Nu falsifica adresele 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 "VeÈ?i configura puntea Tor È?i proxy-ul local ulterior dupÄ? conectarea la reÈ?ea. "
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Bun venit la 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 "Pentru a lansa ghidul setÄ?rilor Tails' , apasaÅ£i butonul <b>FÄ? turul </b> de deasupra"
+#: 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 "DeblocaÅ£i"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "LimbÄ? È?i Regiune"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Reblocarea mediului de stocare persistent a eÈ?uat. "
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "SetÄ?ri implicite"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
+msgstr "Se deblocheazÄ?..."
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "SalvaÅ£i setÄ?rile de LimbÄ? È?i Regiune"
+#: 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 "Deblocare imposibilÄ? a dispozitivului de stocare criptat cu aceastÄ? parolÄ?."
 
-#: 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 "_Limba"
 
-#: 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 "_Configurare tastaturÄ?"
 
-#: 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 "_Formaturi"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Fus orar"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "_Mediu Stocare PersistentÄ? Criptat"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "AratÄ? parola"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "ConfiguraÅ£i stocarea persistentÄ?"
-
-#. 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Å£i parola pentru deblocarea stocÄ?rii persistente"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "BlocaÅ£i din nou Stocarea PersistentÄ?"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "Mediul de stocare persistent este deblocat. ReporniÅ£i Tails pentru a-l bloca din nou."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_SetÄ?ri AdiÈ?ionale"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "SalvaÅ£i SetÄ?rile AdiÈ?ionale"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "AdaugaÅ£i o setare adiÈ?ionalÄ?"
-
-#: 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 "Configurare reÈ?ea"
-
-#: 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 "DacÄ? conexiunea de Internet este cenzuratÄ?, filtratÄ?, sau trecutÄ? printr-un proxy, puteÈ?i configura o punte Tor sau un proxy local. Pentru a lucra complet Ã®n mod deconectat, puteÈ?i dezactiva reÈ?eaua."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Conectare directÄ? la reÈ?eaua Tor (implicit)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "ConfiguraÅ£i o punte Tor sau un proxy local"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "DezactivaÈ?i toate reÈ?elele"
-
-#: 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 "SetÄ?rile implicite sunt sigure Ã®n majoritatea cazurilor. Pentru a adÄ?uga o setare personalizatÄ?, apasaÅ£i pe butonul \"+\" de mai jos."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_ParolÄ? administrare"
-
-#: 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 "Dezactivat (implicit)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_Falsificare adresÄ? 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 "Activat (implicit)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_Conexiune reÈ?ea"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Camuflaj Windows "
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Activat"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Dezactivat"
-
 #: 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 "Nu s-a putut bloca volumul {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 ""
 
@@ -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 "ParolÄ? administrare"
+
+#: ../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 "SetaÅ£i o parolÄ? de administrare pentru operaÈ?iuni administrative. Altfel, parola de administrare va fi dezactivatÄ? pentru securitate sporitÄ?."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "IntroduceÅ£i o parolÄ? de administrare"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "ConfimaÅ£i parola de administrare"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "DezactivaÅ£i"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "Falsificare adresÄ? 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 "\"Spoofing\"-ul adresei MAC  ascunde numÄ?rul serial al interfeÈ?ei de reÈ?ea (Wi-Fi sau prin cablu) cÄ?tre reÈ?eaua localÄ?. Acest lucru este Ã®n general mai sigur deoarece ajutÄ? la ascunderea geolocaÈ?iei. TotuÈ?i este posibil sÄ? creeze probleme de conectivitate sau sÄ? ridice suspiciuni. "
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "FalsificÄ? toate adresele MAC (implicit)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "Nu falsifica adresele MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Configurare reÈ?ea"
+
+#: ../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 "DacÄ? conexiunea de Internet este cenzuratÄ?, filtratÄ?, sau trecutÄ? printr-un proxy, puteÈ?i configura o punte Tor sau un proxy local. Pentru a lucra complet Ã®n mod deconectat, puteÈ?i dezactiva reÈ?eaua."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Conectare directÄ? la reÈ?eaua Tor (implicit)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "ConfiguraÅ£i o punte Tor sau un proxy local"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "DezactivaÈ?i toate reÈ?elele"
+
+#: ../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 "VeÈ?i configura puntea Tor È?i proxy-ul local ulterior dupÄ? conectarea la reÈ?ea. "
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Bun venit la Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "LimbÄ? È?i Regiune"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "SetÄ?ri implicite"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "_Mediu Stocare PersistentÄ? Criptat"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "ConfiguraÅ£i stocarea persistentÄ?"
+
+#. The label 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Å£i parola pentru deblocarea stocÄ?rii persistente"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "BlocaÅ£i din nou Stocarea PersistentÄ?"
+
+#: ../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 "Mediul de stocare persistent este deblocat. ReporniÅ£i Tails pentru a-l bloca din nou."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_SetÄ?ri AdiÈ?ionale"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "AdaugaÅ£i o setare adiÈ?ionalÄ?"
+
+#: ../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 "SetÄ?rile implicite sunt sigure Ã®n majoritatea cazurilor. Pentru a adÄ?uga o setare personalizatÄ?, apasaÅ£i pe butonul \"+\" de mai jos."
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "Containere de FiÈ?iere"
diff --git a/ru.po b/ru.po
index 2d6b74c6f..d556f9e3e 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 "_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)"
-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 "_Ð?Ð°Ñ?Ð¾Ð»Ñ? Ð?Ð´Ð¼Ð¸Ð½Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¾Ñ?Ð°"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_Ð?Ð¾Ð´Ð¼ÐµÐ½Ð° MAC-Ð°Ð´Ñ?ÐµÑ?Ð°"
+
+#: 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 "Ð?Ð¾Ñ?Ñ? Ð¸ Ð¿Ñ?Ð¾ÐºÑ?Ð¸"
+
+#: 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"
 
-#. 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 "Ð¿Ð¾ Ñ?Ð¼Ð¾Ð»Ñ?Ð°Ð½Ð¸Ñ?: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 Ð½Ðµ Ñ?Ñ?Ð°Ð±Ð¾Ñ?Ð°Ð», ÐºÐ¾Ð´ Ð¾Ñ?Ð¸Ð±ÐºÐ¸ {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"
@@ -206,7 +208,7 @@ msgid ""
 "{stderr}"
 msgstr "cryptsetup Ð½Ðµ Ñ?Ñ?Ð°Ð±Ð¾Ñ?Ð°Ð» ÐºÐ¾Ð´ Ð¾Ñ?Ð¸Ð±ÐºÐ¸ {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"
@@ -214,7 +216,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"
@@ -222,225 +224,37 @@ msgid ""
 "{stderr}"
 msgstr "umount Ð½Ðµ Ñ?Ñ?Ð°Ð±Ð¾Ñ?Ð°Ð» ÐºÐ¾Ð´ Ð¾Ñ?Ð¸Ð±ÐºÐ¸ {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>Take a Tour</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 "_Ð¯Ð·Ñ?Ðº"
 
-#: 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 "Ð?Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð½Ð½Ð¾Ðµ Ñ?Ñ?Ð°Ð½Ð¸Ð»Ð¸Ñ?Ðµ Ñ?Ð°Ð·Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ð½Ð¾. Ð?ÐµÑ?ÐµÐ·Ð°Ð¿Ñ?Ñ?Ñ?Ð¸Ñ?Ðµ Tails, Ñ?Ñ?Ð¾Ð±Ñ? Ñ?Ð½Ð¾Ð²Ð° Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²Ð°Ñ?Ñ?."
-
-#: 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 "Ð?Ñ?Ð»Ð¸ Ð²Ð°Ñ?Ðµ Ð¸Ð½Ñ?ÐµÑ?Ð½ÐµÑ?-Ñ?Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ Ð¿Ð¾Ð´Ð²ÐµÑ?Ð³Ð°ÐµÑ?Ñ?Ñ? Ñ?ÐµÐ½Ð·Ñ?Ñ?Ðµ, Ñ?Ð¸Ð»Ñ?Ñ?Ñ?Ð°Ñ?Ð¸Ð¸ Ð¸Ð»Ð¸ Ð¿Ñ?Ð¾ÐºÑ?Ð¸Ñ?Ð¾Ð²Ð°Ð½Ð¸Ñ? Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¸Ñ?Ñ? Ð¼Ð¾Ñ?Ñ? 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 "_Ð?Ð°Ñ?Ð¾Ð»Ñ? Ð?Ð´Ð¼Ð¸Ð½Ð¸Ñ?Ñ?Ñ?Ð°Ñ?Ð¾Ñ?Ð°"
-
-#: 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-Ð°Ð´Ñ?ÐµÑ?Ð°"
-
-#: 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 "_Ð?Ð°Ñ?ÐºÐ¸Ñ?Ð¾Ð²ÐºÐ° Ð¿Ð¾Ð´ Windows"
-
-#: 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 "ÐÑ?Ð° Ð²ÐµÑ?Ñ?Ð¸Ñ? Tails Ð¸Ð¼ÐµÐµÑ? Ð¸Ð·Ð²ÐµÑ?Ñ?Ð½Ñ?Ðµ Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ñ? Ð±ÐµÐ·Ð¾Ð¿Ð°Ñ?Ð½Ð¾Ñ?Ñ?Ð¸:"
@@ -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 "{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 "{partition_name} in {container_path}"
@@ -872,14 +691,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} on {drive_name}"
@@ -888,42 +707,42 @@ msgstr "{partition_name} on {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 "Ð?ÐµÐ²ÐµÑ?Ð½Ð°Ñ? Ñ?Ñ?Ð°Ð·Ð° Ð¸Ð»Ð¸ Ð¿Ð°Ñ?Ð°Ð¼ÐµÑ?Ñ?Ñ?"
 
-#: 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 "Ð?Ñ?Ð¸Ð±ÐºÐ° Ð±Ð»Ð¾ÐºÐ¸Ñ?Ð¾Ð²ÐºÐ¸ Ñ?Ð¾Ð¼Ð°"
 
@@ -1121,6 +940,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 "Ð?Ð°Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ð½Ð¾Ðµ _Ð?Ð¾Ñ?Ñ?Ð¾Ñ?Ð½Ð½Ð¾Ðµ Ð¥Ñ?Ð°Ð½Ð¸Ð»Ð¸Ñ?Ðµ"
+
+#: ../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 "_Ð?Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ?ÐµÐ»Ñ?Ð½Ñ?Ðµ Ð½Ð°Ñ?Ñ?Ñ?Ð¾Ð¹ÐºÐ¸"
+
+#: ../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 8852ca3f8..e24f0a66a 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"
-msgstr ""
+#: 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"
-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: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/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"
-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/gui.py:617
-msgid "Back"
-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/gui.py:731
+#: 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 ""
 
-#. 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"
@@ -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 "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 ""
-
-#. 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 6562e5047..4537947b4 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 "_SpustiÅ¥"
 msgid "_Exit"
 msgstr "_UkonÄ?iÅ¥"
 
-#: 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 "Priame (PredvolenÃ©)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Premostenie a 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 "OdomknÃºÅ¥"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Chyba pri znovuzamknutÃ trvalÃ©ho ÃºloÅ¾iska."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
-msgstr "OdomykÃ¡m..."
-
-#: 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 "NedÃ¡ sa odomknÃºÅ¥ Å¡ifrovanÃ© ÃºloÅ¾isko pomocou danÃ©ho hesla."
-
-#: 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 "DodatoÄ?nÃ© nastavenia"
 
-#: 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 "ZruÅ¡iÅ¥"
 
-#: 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 "PridaÅ¥"
 
-#: 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 "SpÃ¤Å¥"
 
-#: 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 "_Heslo administrÃ¡tora"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_Spoofovanie - predstieranie MAC adresy"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_SieÅ¥ovÃ© pripojenie"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Priame (PredvolenÃ©)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Premostenie a 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 "ZapnutÃ© (predvolenÃ©)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "ZapnÃºÅ¥"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "VypnÃºÅ¥"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "VypnutÃ© (predvolenÃ©)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "Vypnutie"
 
-#: 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 "_ZapnÃºÅ¥ 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 failed with return code {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"
@@ -184,7 +186,7 @@ msgid ""
 "{stderr}"
 msgstr "cryptsetup failed with return code {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"
@@ -192,7 +194,7 @@ msgid ""
 "{stderr}"
 msgstr "live-persist failed with return code {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"
@@ -200,225 +202,37 @@ msgid ""
 "{stderr}"
 msgstr "umount failed with return code {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 "Heslo sprÃ¡vcu"
-
-#: 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 "V prÃpade potreby vykonÃ¡vaÅ¥ Ãºlohy sprÃ¡vcu, nastavte heslo sprÃ¡vcu. V opaÄ?nom prÃpade bude zakÃ¡zanÃ© kvÃ´li vyÅ¡Å¡ej bezpeÄ?nosti."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Zadajte heslo sprÃ¡vcu"
-
-#: 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 "PotvrdiÅ¥"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "PotvrÄ?te heslo sprÃ¡vcu"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "ZakÃ¡zaÅ¥"
-
-#. 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 KamuflÃ¡Å¾"
-
-#. 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 "TÃ¡to voÄ¾ba upravÃ podobnosÅ¥ Tails bliÅ¾Å¡ie k Microsoft Windows 10. Toto mÃ´Å¾e byÅ¥ uÅ¾itoÄ?nÃ© na verejnych miestach v zÃ¡ujme vyhnÃºÅ¥ sa podozreniu."
-
-#. 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 kamuflÃ¡Å¾"
-
-#: 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 "Predstieranie MAC adresy"
-
-#: 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 "Spoofovanie - predstieranie MAC adries skryje sÃ©riovÃ© Ä?Ãsla vaÅ¡ich sieÅ¥ovÃ½ch kariet (Wi-Fi aj kÃ¡blovÃ½ch) pre lokÃ¡lne siete. Toto napomÃ´Å¾e k schovaniu vaÅ¡ej geografickej polohy. AvÅ¡ak mÃ´Å¾e spÃ´sobiÅ¥ problÃ©my s konektivitou alebo vyzeraÅ¥ podozrivo."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "SpoofnuÅ¥ - predstieraÅ¥ vÅ¡etky MAC adresy (predvolenÃ©)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "NespoofnuÅ¥ - nepredstieraÅ¥ vÅ¡etky MAC adresy"
-
-#: 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 "NastavÃm Tor premostenie a miestne proxy neskÃ´r, po pripojenÃ do siete."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Vitajte v 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 "Ak chcete sprievodcu nastavenÃm Tails, kliknite <b>Otvor Sprievodcu</b> hore"
+#: 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 "OdomknÃºÅ¥"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Jazyk a RegiÃ³n"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Chyba pri znovuzamknutÃ trvalÃ©ho ÃºloÅ¾iska."
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "PredvolenÃ© nastavenia"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
+msgstr "OdomykÃ¡m..."
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "UloÅ¾iÅ¥ nastavenie Jazyku a RegiÃ³nu"
+#: 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 "NedÃ¡ sa odomknÃºÅ¥ Å¡ifrovanÃ© ÃºloÅ¾isko pomocou danÃ©ho hesla."
 
-#: 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 "_Jazyk"
 
-#: 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 "_RozloÅ¾enie Klavesnice"
 
-#: 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 "_RegionÃ¡lny formÃ¡t"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Ä?asovÃ© pÃ¡smo"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Å ifrovanÃ© _TrvalÃ© ÃºloÅ¾isko"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "UkÃ¡Å¾ heslo"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "NakonfigurovaÅ¥ TrvalÃ© ÃºloÅ¾isko"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "ZvoÄ¾te prÃstupovÃ© heslo na odomknutie trvalÃ©ho oddielu."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Znova uzamknÃºÅ¥ TrvalÃ© ÃºloÅ¾isko"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "VaÅ¡e TrvalÃ© ÃºloÅ¾isko je odomknutÃ©. ReÅ¡tartujte Tails pre zamknutie."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_DodatoÄ?nÃ© nastavenia"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "UloÅ¾iÅ¥ dodatoÄ?nÃ© nastavenia"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "PridaÅ¥ dodatoÄ?nÃ© nastavenie"
-
-#: 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 "Nastavenia siete"
-
-#: 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 "Ak je pripojenie tohto poÄ?ÃtaÄ?a k Internetu je cenzurovanÃ©, filtrovanÃ© alebo sprostredkovÃ¡vanÃ©, mÃ´Å¾ete nakonfigurovaÅ¥ Tor premostenie alebo miestne proxy. Na prÃ¡cu offline, mÃ´Å¾ete Ãºplne vypnÃºÅ¥ sieÅ¥."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "PripojiÅ¥ priamo do siete Tor. (predvolenÃ©)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "KonfigurovaÅ¥ Tor premostenie alebo miestne proxy."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "DeaktivovaÅ¥ vÅ¡etky siete"
-
-#: 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 "PredvolenÃ© nastavenia sÃº bezpeÄ?nÃ© vo vÃ¤Ä?Å¡ine prÃpadov. Ak chcete upraviÅ¥ nastavenia stlaÄ?te \"+\" tlaÄ?idlo dolu."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Heslo administrÃ¡tora"
-
-#: 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 "VypnutÃ© (predvolenÃ©)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_Spoofovanie - predstieranie MAC adresy"
-
-#: 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 "ZapnutÃ© (predvolenÃ©)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_SieÅ¥ovÃ© pripojenie"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Maskovanie ako Windows"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "ZapnÃºÅ¥"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "VypnÃºÅ¥"
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -717,6 +531,11 @@ msgstr "NastaviÅ¥ heslo na odomknutie obrazovky."
 msgid "Password"
 msgstr "Heslo"
 
+#: 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 "PotvrdiÅ¥"
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr "TÃ¡to verzia Tails mÃ¡ znÃ¡me bezpeÄ?nostnÃ© problÃ©my:"
@@ -813,35 +632,35 @@ msgstr "OtvoriÅ¥ Onion Okruhy"
 
 #. 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} (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} in {container_path}"
@@ -850,14 +669,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} on {drive_name}"
@@ -866,42 +685,42 @@ msgstr "{partition_name} on {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 "NesprÃ¡vne heslo alebo parametre"
 
-#: 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 "Chyba pri odomknutÃ oblasti"
 
 #. 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 "Nepodarilo sa odomknÃºÅ¥ oblasÅ¥ {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 "Jedna, alebo niekoÄ¾ko aplikÃ¡ciÃ stÃ¡le vyuÅ¾ivajÃº zvÃ¤zok"
 
 #. 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 "Uzamknutie zvÃ¤zku {volume_name} nebolo moÅ¾nÃ© :\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 "Zamykanie zvÃ¤zku zlyhalo"
 
@@ -1099,6 +918,130 @@ msgid ""
 " ($(command_line))"
 msgstr "VyÅ¾adovanÃ¡ autentifikÃ¡cia pre ostrÃ¡nenie balÃÅ¡ku z VÃ¡Å¡ho doplnkovÃ©ho softvÃ©ru ($(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 "Heslo sprÃ¡vcu"
+
+#: ../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 "V prÃpade potreby vykonÃ¡vaÅ¥ Ãºlohy sprÃ¡vcu, nastavte heslo sprÃ¡vcu. V opaÄ?nom prÃpade bude zakÃ¡zanÃ© kvÃ´li vyÅ¡Å¡ej bezpeÄ?nosti."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Zadajte heslo sprÃ¡vcu"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "PotvrÄ?te heslo sprÃ¡vcu"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "ZakÃ¡zaÅ¥"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "Predstieranie MAC adresy"
+
+#: ../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 "Spoofovanie - predstieranie MAC adries skryje sÃ©riovÃ© Ä?Ãsla vaÅ¡ich sieÅ¥ovÃ½ch kariet (Wi-Fi aj kÃ¡blovÃ½ch) pre lokÃ¡lne siete. Toto napomÃ´Å¾e k schovaniu vaÅ¡ej geografickej polohy. AvÅ¡ak mÃ´Å¾e spÃ´sobiÅ¥ problÃ©my s konektivitou alebo vyzeraÅ¥ podozrivo."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "SpoofnuÅ¥ - predstieraÅ¥ vÅ¡etky MAC adresy (predvolenÃ©)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "NespoofnuÅ¥ - nepredstieraÅ¥ vÅ¡etky MAC adresy"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Nastavenia siete"
+
+#: ../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 "Ak je pripojenie tohto poÄ?ÃtaÄ?a k Internetu je cenzurovanÃ©, filtrovanÃ© alebo sprostredkovÃ¡vanÃ©, mÃ´Å¾ete nakonfigurovaÅ¥ Tor premostenie alebo miestne proxy. Na prÃ¡cu offline, mÃ´Å¾ete Ãºplne vypnÃºÅ¥ sieÅ¥."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "PripojiÅ¥ priamo do siete Tor. (predvolenÃ©)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "KonfigurovaÅ¥ Tor premostenie alebo miestne proxy."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "DeaktivovaÅ¥ vÅ¡etky siete"
+
+#: ../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 "NastavÃm Tor premostenie a miestne proxy neskÃ´r, po pripojenÃ do siete."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Vitajte v Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Jazyk a RegiÃ³n"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "PredvolenÃ© nastavenia"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Å ifrovanÃ© _TrvalÃ© ÃºloÅ¾isko"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "NakonfigurovaÅ¥ TrvalÃ© ÃºloÅ¾isko"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "ZvoÄ¾te prÃstupovÃ© heslo na odomknutie trvalÃ©ho oddielu."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Znova uzamknÃºÅ¥ TrvalÃ© ÃºloÅ¾isko"
+
+#: ../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 "VaÅ¡e TrvalÃ© ÃºloÅ¾isko je odomknutÃ©. ReÅ¡tartujte Tails pre zamknutie."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_DodatoÄ?nÃ© nastavenia"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "PridaÅ¥ dodatoÄ?nÃ© nastavenie"
+
+#: ../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 "PredvolenÃ© nastavenia sÃº bezpeÄ?nÃ© vo vÃ¤Ä?Å¡ine prÃpadov. Ak chcete upraviÅ¥ nastavenia stlaÄ?te \"+\" tlaÄ?idlo dolu."
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "SÃºborovÃ© kontajnery"
diff --git a/sl.po b/sl.po
index e093b0839..c6d28a9c0 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 "_Zagon"
 msgid "_Exit"
 msgstr "_Izhod"
 
-#: 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 "PrekliÄ?i"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
+msgstr "Dodaj"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
+msgstr "Nazaj"
+
+#: 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:398
-msgid "Offline"
+#: 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: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:206
+msgid "_Network Connection"
 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:215
+msgid "Direct (default)"
 msgstr ""
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
-msgstr "Odklepanje..."
+#: 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: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:219
+msgid "Offline"
 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:270
+msgid "On (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"
-msgstr "PrekliÄ?i"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Vklop"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
-msgstr "Dodaj"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Izklop"
 
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
-msgstr "Nazaj"
+#: 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/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "Izklop"
 
-#: 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"
@@ -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 "Potrdi"
-
-#: 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 Camouflage"
-
-#. 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"
-msgstr ""
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
+msgstr "Odklepanje..."
 
-#: 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 "Show Passphrase"
-
-#: 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 "Vklop"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Izklop"
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -710,6 +524,11 @@ msgstr ""
 msgid "Password"
 msgstr "Geslo"
 
+#: 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 "Potrdi"
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr "Ta verzija Sledi ima znane varnostne izhode:"
@@ -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 9c998a393..130a2ea73 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 "Cancel"
+
+#: 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"
+#: 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/ui/additional_settings.py:274
+msgid "Off"
 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:276
+msgid "Off (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: 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"
@@ -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 fa7a69aa1..bedd47f2f 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 "_LÃ«shoni"
 msgid "_Exit"
 msgstr "_Dilni"
 
-#: 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 "I shkÃ«putur"
-
-#: 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 "Zhblloko"
-
-#: 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 "CilÃ«sime ShtesÃ«"
 
-#: 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 "Anuloni"
 
-#: 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 "Shtoni"
 
-#: 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 "Mbrapa"
 
-#: 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 ""
+
+#: 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 ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "I shkÃ«putur"
+
+#: 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 "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 ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "Mbylleni"
 
-#: 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"
@@ -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 "FjalÃ«kalimi i Administrimit"
-
-#: 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 "Ripohoje"
-
-#: 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 "Ã?aktivizoje"
-
-#. 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/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 "Zhblloko"
 
-#: 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."
+#: 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:531
-msgid "Welcome to Tails!"
-msgstr "MirÃ«sevini nÃ« 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"
+#: 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:581
-msgid "Language & Region"
-msgstr "Gjuha & Zona"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Rregullimet e parazgjedhura"
-
-#: 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 "Shfaq FrazÃ«kalimin"
-
-#: 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 "Ruaj CilÃ«simet ShtesÃ«"
-
-#: 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 "Konfiguro urÃ«n e Tor ose proxy lokal"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Ã?'aktivizoni tÃ« gjitha rrjetet"
-
-#: 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 "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 ""
@@ -711,6 +525,11 @@ msgstr ""
 msgid "Password"
 msgstr "FjalÃ«kalim"
 
+#: 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 "Ripohoje"
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr "Ky version i Tails ka probleme sigurie tÃ« njohura:"
@@ -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 "FjalÃ«kalimi i Administrimit"
+
+#: ../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 "Ã?aktivizoje"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in: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 "Konfiguro urÃ«n e Tor ose proxy lokal"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Ã?'aktivizoni tÃ« gjitha rrjetet"
+
+#: ../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 "MirÃ«sevini nÃ« Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Gjuha & Zona"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Rregullimet e parazgjedhura"
+
+#: ../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 b49770908..8df3cc779 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 "_Pokreni"
 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)"
-msgstr "Direktno (podrazumevano)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Most i proxy"
-
-#: 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 "Nije moguÄ?e otkljuÄ?ati Å¡ifrovano skladiÅ¡te sa ovom lozinkom."
-
-#: 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 "Dodatna podeÅ¡avanja"
 
-#: 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 "OtkaÅ¾i"
 
-#: 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 "_Administratorksa Lozinka"
+
+#: 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 "Direktno (podrazumevano)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Most i proxy"
+
+#: 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 "UkljuÄ?eno (podrazumevano)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "UkljuÄ?eno"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "IskljuÄ?eno"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "IskljuÄ?eno (podrazumevano)"
+
+#: 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 "_Pokreni 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 ""
-
-#: 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"
@@ -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 "Administratorska lozinka"
-
-#: 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 "Postavi administratorsku lozinku ukoliko je potrebno izvrÅ¡iti administratorske zadatke. U suprotnom, administratorska lozinka Ä?e biti onemoguÄ?ena radi veÄ?e bezbednosti."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Unesi administratorsku lozinku"
-
-#: 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 "Potvrdi"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Potvrdi administratorsku lozinku"
-
-#: 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 kamuflaÅ¾a"
-
-#. 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 "Ova opcija Ä?e uÄ?initi da Tails izgleda kao Microsoft Windows 10. Ovo moÅ¾e biti korisno da se izbegne sumnjiÄ?avost na javnim mestima."
-
-#. 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 kamuflaÅ¾a"
-
-#: 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/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:344
-msgid "Don't spoof MAC addresses"
+#: 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:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "KonfigurisaÄ?eÅ¡ Tor most i lokalni proxy kasnije prilikom povezivanja na mreÅ¾u."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "DobrodoÅ¡li u 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 "Za voÄ?enje kroz Tails podeÅ¡avanja klikni na <b>ZapoÄ?ni obilazak</b> koji se nalazi iznad"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Jezik i region"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Podrazumevana podeÅ¡avanja"
+#: 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 "SaÄ?uvaj podeÅ¡avanja jezika i regiona"
+#: 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 "Nije moguÄ?e otkljuÄ?ati Å¡ifrovano skladiÅ¡te sa ovom lozinkom."
 
-#: 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 "_Jezik"
 
-#: 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 "_Raspored Tastature"
 
-#: 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 "_Formati"
 
-#: 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 "_Dodatna PodeÅ¡avanja"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "SaÄ?uvaj Dodatna podeÅ¡avanja"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Dodaj Dodatna podeÅ¡avanja"
-
-#: 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 "Konfigurisanje mreÅ¾e"
-
-#: 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 "PoveÅ¾i se direktno na Tor mreÅ¾u (podrazumevano)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "KonfiguriÅ¡i Tor most ili lokalni proxy"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "OnemoguÄ?i svako umreÅ¾avanje"
-
-#: 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 "Podrazumevana podeÅ¡avanja su najÄ?eÅ¡Ä?e sigurna. Za dodavanje prilagoÄ?enih podeÅ¡avanja pritisni \"+\" dugme koje se nalazi ispod."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Administratorksa Lozinka"
-
-#: 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 "IskljuÄ?eno (podrazumevano)"
-
-#: 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 "UkljuÄ?eno (podrazumevano)"
-
-#: 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 "_Windows KamuflaÅ¾a"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "UkljuÄ?eno"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "IskljuÄ?eno"
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -713,6 +527,11 @@ msgstr "Postavi lozinku za otkljuÄ?avanje ekrana."
 msgid "Password"
 msgstr "Lozinka"
 
+#: 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 "Potvrdi"
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr "Ova verzija Tails-a ima poznate sledeÄ?e bezbednosne probleme:"
@@ -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 "{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} Prostorni medij"
 
 #. 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} u {container_path}"
@@ -846,14 +665,14 @@ msgstr "{partition_name} u {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} na {drive_name}"
@@ -862,42 +681,42 @@ msgstr "{partition_name} na {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 "PogreÅ¡na lozinka ili parametri"
 
-#: 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 "GreÅ¡ka pri otkljuÄ?avanju prostornog medija"
 
 #. 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 "Ne moÅ¾e se otkljuÄ?ati prostorni medij {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 "Ne moÅ¾e se zakljuÄ?ati prostorni medij {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 ""
 
@@ -1095,6 +914,130 @@ msgid ""
 " ($(command_line))"
 msgstr "Potrebna je autentifikacija da bi uklonili paket iz VaÅ¡eg dodatnog softvera ($(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 "Administratorska lozinka"
+
+#: ../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 "Postavi administratorsku lozinku ukoliko je potrebno izvrÅ¡iti administratorske zadatke. U suprotnom, administratorska lozinka Ä?e biti onemoguÄ?ena radi veÄ?e bezbednosti."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Unesi administratorsku lozinku"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Potvrdi administratorsku lozinku"
+
+#: ../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 "Konfigurisanje mreÅ¾e"
+
+#: ../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 "PoveÅ¾i se direktno na Tor mreÅ¾u (podrazumevano)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "KonfiguriÅ¡i Tor most ili lokalni proxy"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "OnemoguÄ?i svako umreÅ¾avanje"
+
+#: ../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 "KonfigurisaÄ?eÅ¡ Tor most i lokalni proxy kasnije prilikom povezivanja na mreÅ¾u."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "DobrodoÅ¡li u Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Jezik i region"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Podrazumevana podeÅ¡avanja"
+
+#: ../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 "_Dodatna PodeÅ¡avanja"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Dodaj Dodatna podeÅ¡avanja"
+
+#: ../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 "Podrazumevana podeÅ¡avanja su najÄ?eÅ¡Ä?e sigurna. Za dodavanje prilagoÄ?enih podeÅ¡avanja pritisni \"+\" dugme koje se nalazi ispod."
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "SpremiÅ¡ta datoteka"
diff --git a/sv.po b/sv.po
index d6309e051..a965b76d9 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)"
-msgstr "Direkt (standard)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Bro & proxy"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Nedkopplad"
-
-#: 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 "LÃ¥s upp"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Misslyckades att lÃ¥sa bestÃ¥ende lagring."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
-msgstr "LÃ¥ser upp..."
-
-#: 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 "Kan inte lÃ¥sa upp krypterad lagring med detta lÃ¶senord."
-
-#: 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 "Ytterligare instÃ¤llningar"
 
-#: 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 "Avbryt"
 
-#: 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 "LÃ¤gg till"
 
-#: 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 "Tillbaka"
 
-#: 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 "_AdministrationslÃ¶senord"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_Fejka MAC-adress"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_NÃ¤tverksanslutning"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Direkt (standard)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Bro & proxy"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Nedkopplad"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "PÃ¥ (standard)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "PÃ¥"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Av"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Av (standard)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "StÃ¤ng av"
 
-#: 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 "_Starta 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 "standard: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 misslyckades med felkod {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"
@@ -193,7 +195,7 @@ msgid ""
 "{stderr}"
 msgstr "cryptsetup misslyckades med felkod {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"
@@ -201,7 +203,7 @@ msgid ""
 "{stderr}"
 msgstr "live-persist misslyckades med felkod {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"
@@ -209,225 +211,37 @@ msgid ""
 "{stderr}"
 msgstr "umount misslyckades med felkod {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 "AdministrationslÃ¶senord"
-
-#: 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 "Ange ett administratÃ¶rslÃ¶senord ifall du behÃ¶ver utfÃ¶ra administrativa uppgifter.\nI annat fall kommer administratÃ¶rslÃ¶senord inaktiveras fÃ¶r bÃ¤ttre sÃ¤kerhet."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Ange ett administrationslÃ¶senord"
-
-#: 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 "BekrÃ¤fta ditt administrationslÃ¶senord"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Inaktivera"
-
-#. 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-kamouflage"
-
-#. 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 "Det hÃ¤r alternativet gÃ¶r att Tails ser ut som Microsoft Windows 10. Detta kan vara anvÃ¤ndbart fÃ¶r att undvika att vÃ¤cka misstanke pÃ¥ offentliga platser."
-
-#. 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-kamouflage"
-
-#: 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 "Fejka MAC-adress"
-
-#: 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 "Genom att fejka MAC-adresser dÃ¶ljer du serienummer pÃ¥ nÃ¤tverkskortet (Wi-Fi eller kabel) fÃ¶r lokala nÃ¤tverk. Det kan hjÃ¤lpa dig dÃ¶lja din geografiska position. Men det kan ocksÃ¥ orsaka anslutningsproblem eller verka misstÃ¤nksamt."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Fejka alla MAC-adresser (standard)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "Fejka inte alla MAC-adresser"
-
-#: 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 "Du konfigurerar Tor-bryggan och lokala proxyn senare efter anslutning till ett nÃ¤tverk."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "VÃ¤lkommen till 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 "FÃ¶r att guidas genom Tails instÃ¤llningar, klicka pÃ¥ <b>Ta en tur</b> ovan"
+#: 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 "LÃ¥s upp"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "SprÃ¥k & region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Misslyckades att lÃ¥sa bestÃ¥ende lagring."
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "StandardinstÃ¤llningar"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
+msgstr "LÃ¥ser upp..."
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Spara sprÃ¥k- och regionsinstÃ¤llningar"
+#: 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 "Kan inte lÃ¥sa upp krypterad lagring med detta lÃ¶senord."
 
-#: 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 "_SprÃ¥k"
 
-#: 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 "_Tangentbordslayout"
 
-#: 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 "_Format"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Tidszon"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Krypterad _bestÃ¥ende lagring"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Visa lÃ¶senfras"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Konfigurera bestÃ¥ende lagring"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "Mata in din lÃ¶senfras fÃ¶r att lÃ¥sa upp den bestÃ¥ende lagringen"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "LÃ¥s bestÃ¥ende lagring igen"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "Din bestÃ¥ende lagring Ã¤r upplÃ¥st. Starta om Tails fÃ¶r att lÃ¥sa den igen."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_Ytterligare instÃ¤llningar"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Spara ytterligare instÃ¤llningar"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "LÃ¤gg till ytterligare instÃ¤llning"
-
-#: 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 "NÃ¤tverkskonfiguration"
-
-#: 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 "Om din Internet-anslutning censureras, filtreras eller gÃ¥r via proxy kan du konfigurera en Tor-brygga eller en lokal proxy. FÃ¶r att arbeta helt nedkopplad kan du inaktivera alla nÃ¤tverk."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Anslut direkt till Tor-nÃ¤tverket (standard)."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Konfigurera en Tor-bro eller lokal proxy"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Inaktivera alla nÃ¤tverk"
-
-#: 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 "StandardinstÃ¤llningarna Ã¤r sÃ¤kra i de flesta situationerna. FÃ¶r att lÃ¤gga till en anpassad instÃ¤llning, tryck pÃ¥ \"+\"-knappen nedan."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_AdministrationslÃ¶senord"
-
-#: 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 "Av (standard)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_Fejka MAC-adress"
-
-#: 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 "PÃ¥ (standard)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_NÃ¤tverksanslutning"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Windows-kamouflage"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "PÃ¥"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Av"
-
 #: 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 "En eller flera program hÃ¥ller volymen upptagen."
 
 #. 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 "Kunde inte lÃ¥sa volymen {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 "LÃ¥sning av volymen misslyckades"
 
@@ -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 "AdministrationslÃ¶senord"
+
+#: ../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 "Ange ett administratÃ¶rslÃ¶senord ifall du behÃ¶ver utfÃ¶ra administrativa uppgifter.\nI annat fall kommer administratÃ¶rslÃ¶senord inaktiveras fÃ¶r bÃ¤ttre sÃ¤kerhet."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Ange ett administrationslÃ¶senord"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "BekrÃ¤fta ditt administrationslÃ¶senord"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Inaktivera"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "Fejka MAC-adress"
+
+#: ../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 "Genom att fejka MAC-adresser dÃ¶ljer du serienummer pÃ¥ nÃ¤tverkskortet (Wi-Fi eller kabel) fÃ¶r lokala nÃ¤tverk. Det kan hjÃ¤lpa dig dÃ¶lja din geografiska position. Men det kan ocksÃ¥ orsaka anslutningsproblem eller verka misstÃ¤nksamt."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Fejka alla MAC-adresser (standard)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "Fejka inte alla MAC-adresser"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "NÃ¤tverkskonfiguration"
+
+#: ../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 "Om din Internet-anslutning censureras, filtreras eller gÃ¥r via proxy kan du konfigurera en Tor-brygga eller en lokal proxy. FÃ¶r att arbeta helt nedkopplad kan du inaktivera alla nÃ¤tverk."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Anslut direkt till Tor-nÃ¤tverket (standard)."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Konfigurera en Tor-bro eller lokal proxy"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Inaktivera alla nÃ¤tverk"
+
+#: ../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 "Du konfigurerar Tor-bryggan och lokala proxyn senare efter anslutning till ett nÃ¤tverk."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "VÃ¤lkommen till Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "SprÃ¥k & region"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "StandardinstÃ¤llningar"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Krypterad _bestÃ¥ende lagring"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Konfigurera bestÃ¥ende lagring"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "Mata in din lÃ¶senfras fÃ¶r att lÃ¥sa upp den bestÃ¥ende lagringen"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "LÃ¥s bestÃ¥ende lagring igen"
+
+#: ../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 "Din bestÃ¥ende lagring Ã¤r upplÃ¥st. Starta om Tails fÃ¶r att lÃ¥sa den igen."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_Ytterligare instÃ¤llningar"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "LÃ¤gg till ytterligare instÃ¤llning"
+
+#: ../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 "StandardinstÃ¤llningarna Ã¤r sÃ¤kra i de flesta situationerna. FÃ¶r att lÃ¤gga till en anpassad instÃ¤llning, tryck pÃ¥ \"+\"-knappen nedan."
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "FilbehÃ¥llare"
diff --git a/sw.po b/sw.po
index 9c619aa45..933741ed5 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 "futa"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
+msgstr "Ongeza"
+
+#: 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:398
-msgid "Offline"
-msgstr "nje ya mkondo"
+#: 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: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:156
+msgid "_MAC Address Spoofing"
 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:206
+msgid "_Network Connection"
 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:215
+msgid "Direct (default)"
 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:217
+msgid "Bridge & Proxy"
 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:219
+msgid "Offline"
+msgstr "nje ya mkondo"
+
+#: 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: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 "futa"
+#: 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:609
-msgid "Add"
-msgstr "Ongeza"
+#: 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:617
-msgid "Back"
+#: 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/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: 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"
@@ -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 "Nywila\nnenosiri"
 
+#: 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 01aa54a57..a144830f6 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/ui/add_settings_dialog.py:46
+msgid "Add"
+msgstr "à®?à¯?à®°à¯?"
+
+#: 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/ui/additional_settings.py:56
+msgid "_Administration Password"
 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/additional_settings.py:156
+msgid "_MAC Address Spoofing"
 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:206
+msgid "_Network Connection"
 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:215
+msgid "Direct (default)"
 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:217
+msgid "Bridge & Proxy"
 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:219
+msgid "Offline"
 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:270
+msgid "On (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"
-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/gui.py:609
-msgid "Add"
-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/gui.py:617
-msgid "Back"
-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/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: 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"
@@ -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 72bfc2a9c..9b1597a55 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 "_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)"
-msgstr "Direct (default)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Bridge & 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 "Unlock"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Failed to relock persistent storage."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
-msgstr "Unlockingâ?¦"
-
-#: 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 "Cannot unlock encrypted storage with this passphrase."
-
-#: 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 "Additional Settings"
 
-#: 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 "Cancel"
 
-#: 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 "Add"
 
-#: 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 "Back"
 
-#: 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 "_Administration Password"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_MAC Address Spoofing"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_Network Connection"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Direct (default)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Bridge & 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 "On (default)"
+
+#: 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 (default)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: 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 "_Start 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 failed with return code {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"
@@ -176,7 +178,7 @@ msgid ""
 "{stderr}"
 msgstr "cryptsetup failed with return code {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"
@@ -184,7 +186,7 @@ msgid ""
 "{stderr}"
 msgstr "live-persist failed with return code {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"
@@ -192,225 +194,37 @@ msgid ""
 "{stderr}"
 msgstr "umount failed with return code {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 "Administration Password"
-
-#: 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 "Set up an administration password if you need to perform administrative tasks. Otherwise, the administration password is disabled for better security."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Enter an administration password"
-
-#: 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 "Confirm your administration password"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Disable"
-
-#. 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 Camouflage"
-
-#. 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 option makes Tails look like Microsoft Windows 10. This can be useful to avoid attracting suspicion in public places."
-
-#. 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 camouflage"
-
-#: 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 Address Spoofing"
-
-#: 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 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."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Spoof all MAC addresses (default)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "Don't spoof MAC addresses"
-
-#: 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 "You will configure the Tor bridge and local proxy later on after connecting to a network."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Welcome to 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 "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 "Unlock"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Failed to relock persistent storage."
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
+msgstr "Unlockingâ?¦"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "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 "Cannot unlock encrypted storage with this passphrase."
 
-#: 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 "_Language"
 
-#: 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 "_Keyboard Layout"
 
-#: 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 "_Time Zone"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Encrypted _Persistent Storage"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Show Passphrase"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Configure Persistent Storage"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "Enter your passphrase to unlock the persistent storage"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Relock Persistent Storage"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "Your persistent storage is unlocked. Restart Tails to lock it again."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_Additional Settings"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Save Additional Settings"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Add an additional setting"
-
-#: 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 "Network Configuration"
-
-#: 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 "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."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Connect directly to the Tor network (default)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Configure a Tor bridge or local proxy"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Disable all networking"
-
-#: 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 "The default settings are safe in most situations. To add a custom setting, press the \"+\" button below."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Administration Password"
-
-#: 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 (default)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_MAC Address Spoofing"
-
-#: 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 (default)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_Network Connection"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Windows Camouflage"
-
-#: 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 ""
@@ -709,6 +523,11 @@ msgstr "Set up a password to unlock the screen."
 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 "Confirm"
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr "This version of Tails has known security issues:"
@@ -805,35 +624,35 @@ msgstr "Open 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} 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} (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} in {container_path}"
@@ -842,14 +661,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} on {drive_name}"
@@ -858,42 +677,42 @@ msgstr "{partition_name} on {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 "Wrong passphrase or parameters"
 
-#: 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 unlocking 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 "Couldn't unlock 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 "One or more applications are keeping the volume busy."
 
 #. 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 "Couldn't lock 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 "Locking the volume failed"
 
@@ -1091,6 +910,130 @@ msgid ""
 " ($(command_line))"
 msgstr "Authentication is required to remove a package from your additional software ($(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 "Administration Password"
+
+#: ../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 "Set up an administration password if you need to perform administrative tasks. Otherwise, the administration password is disabled for better security."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Enter an administration password"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Confirm your administration password"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Disable"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "MAC Address Spoofing"
+
+#: ../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 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."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Spoof all MAC addresses (default)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "Don't spoof MAC addresses"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Network Configuration"
+
+#: ../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 "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."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Connect directly to the Tor network (default)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Configure a Tor bridge or local proxy"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Disable all networking"
+
+#: ../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 "You will configure the Tor bridge and local proxy later on after connecting to a network."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Welcome to Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Language & Region"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Default Settings"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Encrypted _Persistent Storage"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Configure Persistent Storage"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "Enter your passphrase to unlock the persistent storage"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Relock Persistent Storage"
+
+#: ../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 "Your persistent storage is unlocked. Restart Tails to lock it again."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_Additional Settings"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Add an additional setting"
+
+#: ../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 "The default settings are safe in most situations. To add a custom setting, press the \"+\" button below."
+
 #: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
 msgid "File Containers"
 msgstr "File Containers"
diff --git a/te.po b/te.po
index 219f7f3ba..82b98c8b0 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 "Cancel"
+
+#: 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/ui/add_settings_dialog.py:54
+msgid "Back"
 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/additional_settings.py:56
+msgid "_Administration Password"
 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:156
+msgid "_MAC Address Spoofing"
 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:206
+msgid "_Network Connection"
 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:215
+msgid "Direct (default)"
 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:217
+msgid "Bridge & Proxy"
 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:219
+msgid "Offline"
 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"
+#: 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:609
-msgid "Add"
-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/gui.py:617
-msgid "Back"
+#: 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/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "Shutdown"
 
-#: 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"
@@ -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 9010b2be8..7342f41e9 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)"
-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 ""
+
+#: 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 ""
+
+#: 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 "Shutdown"
 
-#: 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"
@@ -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 "à¸¢à¸´à¸?à¸?à¸µà¸?à¹?à¸à¸?à¸£à¸±à¸?à¸ªà¸¹à¹? Tails!"
+#: 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 "à¸?à¸¥à¸?à¸¥à¹?à¸à¸?"
 
-#. 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:63
+msgid "Failed to relock persistent storage."
 msgstr ""
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-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"
+#: 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 "à¸£à¸¸à¹?à¸?à¸?à¸à¸? Tails à¹?à¸?à¹?à¸?à¸?à¸µà¹?à¸£à¸¹à¹?à¸?à¸±à¸?à¹?à¸?à¸?à¸£à¸°à¹?à¸?à¹?à¸?à¸?à¹?à¸²à¸?à¸?à¸§à¸²à¸¡à¸?à¸¥à¸à¸?à¸ à¸±à¸¢:"
@@ -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 "à¸¢à¸´à¸?à¸?à¸µà¸?à¹?à¸à¸?à¸£à¸±à¸?à¸ªà¸¹à¹? 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 ""
+
+#: ../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 a4c04de63..4abe3a17c 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)"
-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 "_Ð?Ð°Ñ?Ð¾Ð»Ñ? Ð°Ð´Ð¼Ñ?Ð½Ñ?Ñ?Ñ?Ñ?Ð°Ñ?Ð¾Ñ?Ð°"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_Ð?Ñ?Ð´Ð¼Ñ?Ð½Ð° MAC-Ð°Ð´Ñ?ÐµÑ?Ð¸"
+
+#: 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 "Ð?Ñ?Ñ?Ñ? Ñ? Ð¿Ñ?Ð¾ÐºÑ?Ñ?"
+
+#: 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"
 
-#. 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 "Ð·Ð° Ð¿Ñ?Ð¾Ð¼Ð¾Ð²Ñ?Ð°Ð½Ð½Ñ?Ð¼: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, ÐºÐ¾Ð´ Ð¿Ð¾Ð²ÐµÑ?ÐµÐ½Ð½Ñ? {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"
@@ -187,7 +189,7 @@ msgid ""
 "{stderr}"
 msgstr "Ð½ÐµÐ²Ð´Ð°Ñ?Ð° Ð² cryptsetup, ÐºÐ¾Ð´ Ð¿Ð¾Ð²ÐµÑ?Ð½ÐµÐ½Ð½Ñ? {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"
@@ -195,7 +197,7 @@ msgid ""
 "{stderr}"
 msgstr "Ð½ÐµÐ²Ð´Ð°Ñ?Ð° Ð² live-persist, ÐºÐ¾Ð´ Ð¿Ð¾Ð²ÐµÑ?ÐµÐ½Ð½Ñ? {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"
@@ -203,225 +205,37 @@ msgid ""
 "{stderr}"
 msgstr "Ð½ÐµÐ²Ð´Ð°Ñ?Ð° Ð² umount, ÐºÐ¾Ð´ Ð¿Ð¾Ð²ÐµÑ?Ð½ÐµÐ½Ð½Ñ? {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-Ð°Ð´Ñ?ÐµÑ?Ð¸ Ð¿Ñ?Ð¸Ñ?Ð¾Ð²Ñ?Ñ? Ñ?ÐµÑ?Ñ?Ð¹Ð½Ð¸Ð¹ Ð½Ð¾Ð¼ÐµÑ? Ð²Ð°Ñ?Ð¾Ð³Ð¾ Ð¼ÐµÑ?ÐµÐ¶Ð½Ð¾Ð³Ð¾ Ñ?Ð½Ñ?ÐµÑ?Ñ?ÐµÐ¹Ñ?Ñ? (Ð¿Ñ?Ð¾Ð²Ñ?Ð´Ð½Ð¾Ð³Ð¾ Ñ?Ð¸ Ð±ÐµÐ·Ð¿Ñ?Ð¾Ð²Ñ?Ð´Ð½Ð¾Ð³Ð¾) Ð· Ð»Ð¾ÐºÐ°Ð»Ñ?Ð½Ð¾Ñ? Ð¼ÐµÑ?ÐµÐ¶ÐµÑ?. Ð?Ñ?Ð´Ð¼Ñ?Ð½Ð° 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>Take a Tour</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 "_Ð?Ð¾Ð²Ð°"
 
-#: 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 "Ð?Ð°Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?Ñ?Ð¹Ð½Ðµ Ñ?Ñ?Ð¾Ð²Ð¸Ñ?Ðµ Ñ?Ð¾Ð·Ð±Ð»Ð¾ÐºÐ¾Ð²Ð°Ð½Ðµ. Ð?ÐµÑ?ÐµÐ·Ð°Ð¿Ñ?Ñ?Ñ?Ñ?Ñ?Ñ? Tails, Ñ?Ð¾Ð± Ð·Ð°Ð±Ð»Ð¾ÐºÑ?Ð²Ð°Ñ?Ð¸ Ð¹Ð¾Ð³Ð¾ Ð·Ð½Ð¾Ð²."
-
-#: 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 "Ð¯ÐºÑ?Ð¾ Ð²Ð°Ñ?Ðµ Ð·'Ñ?Ð´Ð½Ð°Ð½Ð½Ñ? Ð· Ð?Ð½Ñ?ÐµÑ?Ð½ÐµÑ? Ð¿Ñ?Ð¾Ñ?Ð¾Ð´Ð¸Ñ?Ñ? Ñ?ÐµÐ½Ð·Ñ?Ñ?Ñ?, Ñ?Ñ?Ð»Ñ?Ñ?Ñ? Ð°Ð±Ð¾ Ð¿Ñ?Ð¾ÐºÑ?Ñ?, Ð²Ð¸ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð½Ð°Ð»Ð°Ñ?Ñ?Ñ?Ð²Ð°Ñ?Ð¸ Ð¼Ñ?Ñ?Ñ? 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 "_Ð?Ð°Ñ?Ð¾Ð»Ñ? Ð°Ð´Ð¼Ñ?Ð½Ñ?Ñ?Ñ?Ñ?Ð°Ñ?Ð¾Ñ?Ð°"
-
-#: 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-Ð°Ð´Ñ?ÐµÑ?Ð¸"
-
-#: 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 "_Ð?Ð°Ñ?ÐºÑ?Ð²Ð°Ð½Ð½Ñ? Ð¿Ñ?Ð´ Windows"
-
-#: 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 "Ð¦Ñ? Ð²ÐµÑ?Ñ?Ñ?Ñ? Tails Ð¼Ð°Ñ? Ð²Ñ?Ð´Ð¾Ð¼Ñ? Ð¿Ñ?Ð¾Ð±Ð»ÐµÐ¼Ð¸ Ð±ÐµÐ·Ð¿ÐµÐºÐ¸:"
@@ -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 "Ð?Ñ?Ð´Ð¼Ñ?Ð½Ð° 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-Ð°Ð´Ñ?ÐµÑ?Ð¸ Ð¿Ñ?Ð¸Ñ?Ð¾Ð²Ñ?Ñ? Ñ?ÐµÑ?Ñ?Ð¹Ð½Ð¸Ð¹ Ð½Ð¾Ð¼ÐµÑ? Ð²Ð°Ñ?Ð¾Ð³Ð¾ Ð¼ÐµÑ?ÐµÐ¶Ð½Ð¾Ð³Ð¾ Ñ?Ð½Ñ?ÐµÑ?Ñ?ÐµÐ¹Ñ?Ñ? (Ð¿Ñ?Ð¾Ð²Ñ?Ð´Ð½Ð¾Ð³Ð¾ Ñ?Ð¸ Ð±ÐµÐ·Ð¿Ñ?Ð¾Ð²Ñ?Ð´Ð½Ð¾Ð³Ð¾) Ð· Ð»Ð¾ÐºÐ°Ð»Ñ?Ð½Ð¾Ñ? Ð¼ÐµÑ?ÐµÐ¶ÐµÑ?. Ð?Ñ?Ð´Ð¼Ñ?Ð½Ð° 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 "Ð?Ð°Ñ?Ð¸Ñ?Ñ?Ð¾Ð²Ð°Ð½Ðµ _Ð?Ð¾Ñ?Ñ?Ñ?Ð¹Ð½Ðµ Ñ?Ñ?Ð¾Ð²Ð¸Ñ?Ðµ"
+
+#: ../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 "_Ð?Ð¾Ð´Ð°Ñ?ÐºÐ¾Ð²Ñ? Ð½Ð°Ð»Ð°Ñ?Ñ?Ñ?Ð²Ð°Ð½Ð½Ñ?"
+
+#: ../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 eca3db05a..66fdf3d91 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 "_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"
-msgstr ""
+#: 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"
 
-#: 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/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/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"
+#: 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"
-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/gui.py:617
-msgid "Back"
-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/gui.py:731
+#: 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 ""
 
-#. 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"
@@ -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 b43cc6e0d..462b1de93 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 "Bekor qilish"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
+msgstr "Qoâ??shish"
+
+#: 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:398
-msgid "Offline"
+#: 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: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:156
+msgid "_MAC Address Spoofing"
 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:206
+msgid "_Network Connection"
 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:215
+msgid "Direct (default)"
 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:217
+msgid "Bridge & Proxy"
 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:219
+msgid "Offline"
 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 "Bekor qilish"
+#: 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:609
-msgid "Add"
-msgstr "Qoâ??shish"
+#: 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:617
-msgid "Back"
+#: 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:731
-msgid "Shutdown"
+#: 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/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
 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:177
+msgid "_Start Tails"
 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"
@@ -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 "Tasdiqlash"
-
-#: 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 "Parol"
 
+#: 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 "Tasdiqlash"
+
 #: 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 bd5cbc137..3f5738f04 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 "_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)"
-msgstr "Trá»±c tiáº¿p (máº·c Ä?á»?nh)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Cáº§u ná»?i & á»¦y quyá»?n"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Ngoáº¡i tuyáº¿n"
-
-#: 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 "Má»? khÃ³a"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Tháº¥t báº¡i khi khÃ³a dung lÆ°á»£ng bá»?n vá»¯ng láº¡i."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlockingâ?¦"
-msgstr "Ä?ang má»? khÃ³a..."
-
-#: 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 "KhÃ´ng thá»? má»? khÃ³a vÃ¹ng lÆ°u trá»¯ bá»? mÃ£ hÃ³a vá»?i máºt kháº©u nÃ y."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
 msgid "Additional Settings"
 msgstr "Nhá»¯ng cÃ i Ä?áº·t thÃªm"
 
-#: 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 "Há»§y bá»?"
 
-#: 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 "ThÃªm vÃ o"
 
-#: 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 "LÃ¹i"
 
-#: 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 "_Administration Password"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_MAC Address Spoofing"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_Network Connection"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Trá»±c tiáº¿p (máº·c Ä?á»?nh)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Cáº§u ná»?i & á»¦y quyá»?n"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Ngoáº¡i tuyáº¿n"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "Má»? (máº·c Ä?á»?nh)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Báºt"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "táº¯t"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Táº¯t (máº·c Ä?á»?nh)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
 msgid "Shutdown"
 msgstr "Táº¯t trÃ¬nh duyá»?t"
 
-#: 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 "_Start 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 "máº·c Ä?á»?nh: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-persit tháº¥t báº¡i vá»?i mÃ£ tráº£ vá»? {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"
@@ -178,7 +180,7 @@ msgid ""
 "{stderr}"
 msgstr "cÃ i Ä?áº·t mÃ£ hÃ³a tháº¥t báº¡i vá»?i mÃ£ tráº£ vá»? {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"
@@ -186,7 +188,7 @@ msgid ""
 "{stderr}"
 msgstr "TÃnh trá»±c tiáº¿p-bá»?n vá»¯ng Ä?Ã£ há»?ng vá»?i mÃ£ tráº£ vá»? {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"
@@ -194,225 +196,37 @@ msgid ""
 "{stderr}"
 msgstr "gá»¡ ra tháº¥t báº¡i vá»?i mÃ£ tráº£ vá»? {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 "Máºt kháº©u Quáº£n trá»?"
-
-#: 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 "Thiáº¿t láºp má»?t máºt kháº©u quáº£n trá»? náº¿u báº¡n cáº§n thá»±c hiá»?n cÃ¡c tÃ¡c vá»¥ quáº£n trá»?. Náº¿u khÃ´ng, máºt kháº©u quáº£n trá»? Ä?Æ°á»£c vÃ´ hiá»?u Ä?á»? an toÃ n hÆ¡n."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Nháºp má»?t máºt kháº©u quáº£n trá»?"
-
-#: 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 "XÃ¡c nháºn"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "XÃ¡c nháºn máºt kháº©u quáº£n trá»? cá»§a báº¡n"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "VÃ´ hiá»?u"
-
-#. 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 "Ngá»¥y trang 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 "TÃ¹y chá»?n nÃ y lÃ m Talls trÃ´ng giá»?ng nhÆ° Microsoft Windows 10. Viá»?c nÃ y há»¯u Ãch khi trÃ¡nh viá»?c thu hÃºt nhá»¯ng nghi ngá»? á»? nÆ¡i cÃ´ng cá»?ng."
-
-#. 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 "Sá»± ngá»¥y trang 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 "Sá»± lÃ m giáº£ Ä?á»?a chá»? 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 "Viá»?c lÃ m giáº£ Ä?á»?a chá»? MAC áº£n chuá»?i sá»? cá»§a giao diá»?n máº¡ng lÆ°á»?i cá»§a báº¡n (Wi-fi hoáº·c cÃ³ dÃ¢y) Ä?á»?i vá»?i máº¡ng lÆ°á»?i ná»?i bá»?. Viá»?c lÃ m giáº£ Ä?á»?a chá»? MAC thÆ°á»?ng an toÃ n Æ¡n vÃ¬ nÃ³ giÃºp báº¡n áº©n vá»? trÃ Ä?á»?a lÃ½ cá»§a mÃ¬nh. NhÆ°ng nÃ³ cÃ³ thá»? táº¡o ra nhá»¯ng váº¥n Ä?á»? vá»? káº¿t ná»?i hoáº·c trÃ´ng Ä?Ã¡ng nghi ngá»?."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "LÃ m giáº£ táº¥t cáº£ Ä?á»?a chá»? MAC (máº·c Ä?á»?nh)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "KhÃ´ng lÃ m giáº£ Ä?á»?a chá»? 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 "Báº¡n sáº½ cáº¥u hÃ¬nh cáº§u ná»?i Tor vÃ  á»§y quyá»?n ná»?i bá»? sau khi káº¿t ná»?i tá»?i má»?t máº¡ng lÆ°á»?i."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "ChÃ o má»«ng Ä?áº¿n vá»?i 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 "Ä?á»? Ä?Æ°á»£c hÆ°á»?ng dáº«n vá»? nhá»¯ng cÃ i Ä?áº·t cá»§a Tails, báº¥m chuá»?t vÃ o <b>Take a Tour</b> á»? trÃªn"
+#: 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 "Má»? khÃ³a"
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "NgÃ´n ngá»¯ vÃ  VÃ¹ng"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Tháº¥t báº¡i khi khÃ³a dung lÆ°á»£ng bá»?n vá»¯ng láº¡i."
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Nhá»¯ng cÃ i Ä?áº·t máº·c Ä?á»?nh"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlockingâ?¦"
+msgstr "Ä?ang má»? khÃ³a..."
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "LÆ°u nhá»¯ng cÃ i Ä?áº·t vá»? ngÃ´n ngá»¯ vÃ  vÃ¹ng"
+#: 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 "KhÃ´ng thá»? má»? khÃ³a vÃ¹ng lÆ°u trá»¯ bá»? mÃ£ hÃ³a vá»?i máºt kháº©u nÃ y."
 
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
 msgid "_Language"
 msgstr "_Language"
 
-#: 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 "_Keyboard Layout"
 
-#: 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 "_Time Zone"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Encrypted _Persistent Storage"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Hiá»?n thá»? Ä?oáº¡n máºt kháº©u"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Cáº¥u hÃ¬nh dung lÆ°á»£ng bá»?n vá»¯ng"
-
-#. 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 "Nháºp máºt kháº©u cá»§a báº¡n Ä?á»? má»? khÃ³a dung lÆ°á»£ng bá»?n vá»¯ng"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "KhÃ³a dung lÆ°á»£ng bá»?n vá»¯ng láº¡i"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "PhÃ¢n vÃ¹ng lÆ°u trá»¯ bá»?n vá»¯ng cá»§a báº¡n bá»? má»? khoÃ¡. Khá»?i Ä?á»?ng láº¡i Tails Ä?á»? khoÃ¡ nÃ³ láº¡i."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_Additional Settings"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "LÆ°u nhá»¯ng cÃ i Ä?áº·t thÃªm"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "ThÃªm má»?t cÃ i Ä?áº·t ná»¯a"
-
-#: 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 "Cáº¥u hÃ¬nh máº¡ng lÆ°á»?i"
-
-#: 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 "Náº¿u káº¿t ná»?i Internet cá»§a báº¡n bá»? kiá»?m duyá»?t, lá»?c bá»?, hoáº·c bá»? á»§y quyá»?n báº¡n cÃ³ thá»? cáº¥u hÃ¬nh má»?t cáº§u ná»?i Tor hoáº·c á»§y quyá»?n ná»?i bá»?. Ä?á»? lÃ m viá»?c hoÃ n toÃ n ngoáº¡i tuyáº¿n, báº¡n cÃ³ thá»? vÃ´ hiá»?u má»?i máº¡ng lÆ°á»?i."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Káº¿t ná»?i trá»±c tiáº¿p tá»?i máº¡ng lÆ°á»?i Tor (máº·c Ä?á»?nh)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Cáº¥u hÃ¬nh má»?t cáº§u ná»?i Tor hay má»?t Ä?áº¡i diá»?n (proxy) Ä?á»?a phÆ°Æ¡ng"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "VÃ´ hiá»?u táº¥t cáº£ máº¡ng lÆ°á»?i"
-
-#: 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 "Nhá»¯ng cÃ i Ä?áº·t máº·c Ä?á»?nh lÃ  an toÃ n trong háº§u háº¿t tÃ¬nh huá»?ng. Ä?á»? thÃªm nhá»¯ng cÃ i Ä?áº·t riÃªng, báº¥m nÃºt \"+\" bÃªn dÆ°á»?i."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Administration Password"
-
-#: 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 "Táº¯t (máº·c Ä?á»?nh)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_MAC Address Spoofing"
-
-#: 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 "Má»? (máº·c Ä?á»?nh)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_Network Connection"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Windows Camouflage"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Báºt"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "táº¯t"
-
 #: config/chroot_local-includes/usr/local/bin/keepassxc:15
 #, sh-format
 msgid ""
@@ -711,6 +525,11 @@ msgstr ""
 msgid "Password"
 msgstr "Máºt kháº©u"
 
+#: 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 "XÃ¡c nháºn"
+
 #: config/chroot_local-includes/usr/local/bin/tails-security-check:124
 msgid "This version of Tails has known security issues:"
 msgstr "PhiÃªn báº£n nÃ y cá»§a Tails cÃ³ má»?t vÃ i váº¥n Ä?á»? an ninh Ä?Ã£ Ä?Æ°á»£c biáº¿t Ä?áº¿n:"
@@ -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 "Máºt kháº©u Quáº£n trá»?"
+
+#: ../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 "Thiáº¿t láºp má»?t máºt kháº©u quáº£n trá»? náº¿u báº¡n cáº§n thá»±c hiá»?n cÃ¡c tÃ¡c vá»¥ quáº£n trá»?. Náº¿u khÃ´ng, máºt kháº©u quáº£n trá»? Ä?Æ°á»£c vÃ´ hiá»?u Ä?á»? an toÃ n hÆ¡n."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Nháºp má»?t máºt kháº©u quáº£n trá»?"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "XÃ¡c nháºn máºt kháº©u quáº£n trá»? cá»§a báº¡n"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "VÃ´ hiá»?u"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "Sá»± lÃ m giáº£ Ä?á»?a chá»? 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 "Viá»?c lÃ m giáº£ Ä?á»?a chá»? MAC áº£n chuá»?i sá»? cá»§a giao diá»?n máº¡ng lÆ°á»?i cá»§a báº¡n (Wi-fi hoáº·c cÃ³ dÃ¢y) Ä?á»?i vá»?i máº¡ng lÆ°á»?i ná»?i bá»?. Viá»?c lÃ m giáº£ Ä?á»?a chá»? MAC thÆ°á»?ng an toÃ n Æ¡n vÃ¬ nÃ³ giÃºp báº¡n áº©n vá»? trÃ Ä?á»?a lÃ½ cá»§a mÃ¬nh. NhÆ°ng nÃ³ cÃ³ thá»? táº¡o ra nhá»¯ng váº¥n Ä?á»? vá»? káº¿t ná»?i hoáº·c trÃ´ng Ä?Ã¡ng nghi ngá»?."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "LÃ m giáº£ táº¥t cáº£ Ä?á»?a chá»? MAC (máº·c Ä?á»?nh)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "KhÃ´ng lÃ m giáº£ Ä?á»?a chá»? MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Cáº¥u hÃ¬nh máº¡ng lÆ°á»?i"
+
+#: ../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 "Náº¿u káº¿t ná»?i Internet cá»§a báº¡n bá»? kiá»?m duyá»?t, lá»?c bá»?, hoáº·c bá»? á»§y quyá»?n báº¡n cÃ³ thá»? cáº¥u hÃ¬nh má»?t cáº§u ná»?i Tor hoáº·c á»§y quyá»?n ná»?i bá»?. Ä?á»? lÃ m viá»?c hoÃ n toÃ n ngoáº¡i tuyáº¿n, báº¡n cÃ³ thá»? vÃ´ hiá»?u má»?i máº¡ng lÆ°á»?i."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Káº¿t ná»?i trá»±c tiáº¿p tá»?i máº¡ng lÆ°á»?i Tor (máº·c Ä?á»?nh)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Cáº¥u hÃ¬nh má»?t cáº§u ná»?i Tor hay má»?t Ä?áº¡i diá»?n (proxy) Ä?á»?a phÆ°Æ¡ng"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "VÃ´ hiá»?u táº¥t cáº£ máº¡ng lÆ°á»?i"
+
+#: ../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 "Báº¡n sáº½ cáº¥u hÃ¬nh cáº§u ná»?i Tor vÃ  á»§y quyá»?n ná»?i bá»? sau khi káº¿t ná»?i tá»?i má»?t máº¡ng lÆ°á»?i."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "ChÃ o má»«ng Ä?áº¿n vá»?i Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "NgÃ´n ngá»¯ vÃ  VÃ¹ng"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Nhá»¯ng cÃ i Ä?áº·t máº·c Ä?á»?nh"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Encrypted _Persistent Storage"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Cáº¥u hÃ¬nh dung lÆ°á»£ng bá»?n vá»¯ng"
+
+#. The label 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 "Nháºp máºt kháº©u cá»§a báº¡n Ä?á»? má»? khÃ³a dung lÆ°á»£ng bá»?n vá»¯ng"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "KhÃ³a dung lÆ°á»£ng bá»?n vá»¯ng láº¡i"
+
+#: ../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 "PhÃ¢n vÃ¹ng lÆ°u trá»¯ bá»?n vá»¯ng cá»§a báº¡n bá»? má»? khoÃ¡. Khá»?i Ä?á»?ng láº¡i Tails Ä?á»? khoÃ¡ nÃ³ láº¡i."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_Additional Settings"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "ThÃªm má»?t cÃ i Ä?áº·t ná»¯a"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "Nhá»¯ng cÃ i Ä?áº·t máº·c Ä?á»?nh lÃ  an toÃ n trong háº§u háº¿t tÃ¬nh huá»?ng. Ä?á»? thÃªm nhá»¯ng cÃ i Ä?áº·t riÃªng, báº¥m nÃºt \"+\" bÃªn dÆ°á»?i."
+
 #: ../config/chroot_local-includes/usr/share/tails/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 a97303f21..7651f2bbd 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 "_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"
-msgstr ""
+#: 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"
-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: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/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"
-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/gui.py:617
-msgid "Back"
-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/gui.py:731
+#: 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 ""
 
-#. 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"
@@ -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 "æ¤Tailsç??æ?¬æ??å·²ç?¥å??å®?å?¨å??é¡?ï¼?"
@@ -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 106884d5a..4e74cf96b 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)"
-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 "ç³»çµ±ç®¡ç??å?¡å¯?ç¢¼"
+
+#: 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 "æ©?æ?¥å?¨è??ä»£ç??ä¼ºæ??å?¨"
+
+#: 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"
 
-#. 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 "é ?è¨ï¼?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 "ive-persist å¤±æ??ä¸¦å?³å??é?¯èª¤ä»£ç¢¼ï¼?\n{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"
@@ -189,7 +191,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"
@@ -197,7 +199,7 @@ msgid ""
 "{stderr}"
 msgstr "live-persist å¤±æ??ä¸¦å??å?³ä»¥ä¸?ä»£ç¢¼ {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"
@@ -205,225 +207,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 "è¦?çª?ç³»çµ±å?½è£?"
-
-#. 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 ç³»çµ±ç??å¤?è§?ç??èµ·ä¾?é¡?ä¼¼å¾®è»? 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 "å¾®è»? 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 "ç¶²è·¯å?¡å¯¦é«?ä½?å??å?½è£?"
-
-#: 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 "æ¡è¿?ä½¿ç?¨ 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 "èª?è¨?"
 
-#: 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 "æ?¨ç??æ°¸ä¹?æ?§å?²å?è£?ç½®å·²è¢«è§£é??ï¼?è«?é??æ?°å??å?? Tails ç³»çµ±ä»¥ä¾¿å°?å®?å??æ¬¡é??å®?ã??"
-
-#: 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 "å¾®è»? Windows ç³»çµ±å?½è£?"
-
-#: 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 "æ¤ Tails ç??æ?¬æ??å·²ç?¥ç??å®?å?¨æ?§å??é¡?:"
@@ -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 "{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 "{partition_name} å?¨ {container_path}"
@@ -855,14 +674,14 @@ msgstr "{partition_name} å?¨ {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} å?¨ {drive_name}"
@@ -871,42 +690,42 @@ msgstr "{partition_name} å?¨ {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 "å¯?ç¢¼æ??å??æ?¸é?¯èª¤"
 
-#: 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 "ç?¡æ³?é??å®?æ¤å? å¯?ç£?å??"
 
@@ -1104,6 +923,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 "ç¶²è·¯å?¡å¯¦é«?ä½?å??å?½è£?"
+
+#: ../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 "æ¡è¿?ä½¿ç?¨ 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 "å? å¯?ç??æ°¸ä¹?æ?§å?²å?è£?ç½®"
+
+#: ../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 "é¡?å¤?ç??è¨å®?"
+
+#: ../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/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
Next by Author: [tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
Previous by thread: [tor-commits] [translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
Next by thread: [tor-commits] [translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
Index(es):
- Author
- Thread