[tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
translation at torproject.org
translation at torproject.org
Sun Oct 6 02:19:19 UTC 2019
commit edfc084d44c82f0587bca5a502c917a44a0a3f02
Author: Translation commit bot <translation at torproject.org>
Date: Sun Oct 6 02:19:16 2019 +0000
https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
---
ach.po | 463 ++++++++++++++++++++++++++--------------------------------
af.po | 463 ++++++++++++++++++++++++++--------------------------------
ar.po | 463 ++++++++++++++++++++++++++--------------------------------
ast.po | 463 ++++++++++++++++++++++++++--------------------------------
az.po | 463 ++++++++++++++++++++++++++--------------------------------
be.po | 463 ++++++++++++++++++++++++++--------------------------------
bg.po | 463 ++++++++++++++++++++++++++--------------------------------
bn.po | 463 ++++++++++++++++++++++++++--------------------------------
br.po | 463 ++++++++++++++++++++++++++--------------------------------
bs.po | 463 ++++++++++++++++++++++++++--------------------------------
ca.po | 465 ++++++++++++++++++++++++++---------------------------------
cs.po | 465 ++++++++++++++++++++++++++---------------------------------
cy.po | 463 ++++++++++++++++++++++++++--------------------------------
da.po | 463 ++++++++++++++++++++++++++--------------------------------
de.po | 465 ++++++++++++++++++++++++++---------------------------------
el.po | 463 ++++++++++++++++++++++++++--------------------------------
en_GB.po | 463 ++++++++++++++++++++++++++--------------------------------
eo.po | 463 ++++++++++++++++++++++++++--------------------------------
es.po | 487 +++++++++++++++++++++++++++-----------------------------------
es_AR.po | 465 ++++++++++++++++++++++++++---------------------------------
es_MX.po | 463 ++++++++++++++++++++++++++--------------------------------
et.po | 463 ++++++++++++++++++++++++++--------------------------------
eu.po | 463 ++++++++++++++++++++++++++--------------------------------
fa.po | 463 ++++++++++++++++++++++++++--------------------------------
fi.po | 465 ++++++++++++++++++++++++++---------------------------------
fr.po | 485 +++++++++++++++++++++++++++----------------------------------
fy.po | 463 ++++++++++++++++++++++++++--------------------------------
ga.po | 465 ++++++++++++++++++++++++++---------------------------------
gd.po | 463 ++++++++++++++++++++++++++--------------------------------
gl.po | 463 ++++++++++++++++++++++++++--------------------------------
gu.po | 463 ++++++++++++++++++++++++++--------------------------------
he.po | 465 ++++++++++++++++++++++++++---------------------------------
hi.po | 463 ++++++++++++++++++++++++++--------------------------------
hr.po | 463 ++++++++++++++++++++++++++--------------------------------
hu.po | 465 ++++++++++++++++++++++++++---------------------------------
hy.po | 463 ++++++++++++++++++++++++++--------------------------------
id.po | 463 ++++++++++++++++++++++++++--------------------------------
is.po | 463 ++++++++++++++++++++++++++--------------------------------
it.po | 477 +++++++++++++++++++++++++++---------------------------------
ja.po | 463 ++++++++++++++++++++++++++--------------------------------
ka.po | 463 ++++++++++++++++++++++++++--------------------------------
kab.po | 463 ++++++++++++++++++++++++++--------------------------------
kk.po | 463 ++++++++++++++++++++++++++--------------------------------
km.po | 465 ++++++++++++++++++++++++++---------------------------------
kn.po | 463 ++++++++++++++++++++++++++--------------------------------
ko.po | 463 ++++++++++++++++++++++++++--------------------------------
lt.po | 467 ++++++++++++++++++++++++++---------------------------------
lv.po | 463 ++++++++++++++++++++++++++--------------------------------
mk.po | 463 ++++++++++++++++++++++++++--------------------------------
ml.po | 463 ++++++++++++++++++++++++++--------------------------------
mr.po | 463 ++++++++++++++++++++++++++--------------------------------
ms_MY.po | 463 ++++++++++++++++++++++++++--------------------------------
my.po | 463 ++++++++++++++++++++++++++--------------------------------
nb.po | 463 ++++++++++++++++++++++++++--------------------------------
ne.po | 463 ++++++++++++++++++++++++++--------------------------------
nl.po | 469 ++++++++++++++++++++++++++---------------------------------
nl_BE.po | 463 ++++++++++++++++++++++++++--------------------------------
nn.po | 463 ++++++++++++++++++++++++++--------------------------------
oc.po | 463 ++++++++++++++++++++++++++--------------------------------
or.po | 463 ++++++++++++++++++++++++++--------------------------------
pa.po | 463 ++++++++++++++++++++++++++--------------------------------
pl.po | 463 ++++++++++++++++++++++++++--------------------------------
pt_BR.po | 485 +++++++++++++++++++++++++++----------------------------------
pt_PT.po | 465 ++++++++++++++++++++++++++---------------------------------
ro.po | 465 ++++++++++++++++++++++++++---------------------------------
ru.po | 463 ++++++++++++++++++++++++++--------------------------------
si_LK.po | 463 ++++++++++++++++++++++++++--------------------------------
sk.po | 463 ++++++++++++++++++++++++++--------------------------------
sl.po | 463 ++++++++++++++++++++++++++--------------------------------
son.po | 463 ++++++++++++++++++++++++++--------------------------------
sq.po | 463 ++++++++++++++++++++++++++--------------------------------
sr.po | 463 ++++++++++++++++++++++++++--------------------------------
sv.po | 465 ++++++++++++++++++++++++++---------------------------------
sw.po | 463 ++++++++++++++++++++++++++--------------------------------
ta.po | 463 ++++++++++++++++++++++++++--------------------------------
tails.pot | 463 ++++++++++++++++++++++++++--------------------------------
te.po | 463 ++++++++++++++++++++++++++--------------------------------
th.po | 463 ++++++++++++++++++++++++++--------------------------------
tr.po | 485 +++++++++++++++++++++++++++----------------------------------
uk.po | 463 ++++++++++++++++++++++++++--------------------------------
ur.po | 463 ++++++++++++++++++++++++++--------------------------------
uz.po | 463 ++++++++++++++++++++++++++--------------------------------
vi.po | 463 ++++++++++++++++++++++++++--------------------------------
zh_CN.po | 485 +++++++++++++++++++++++++++----------------------------------
zh_HK.po | 463 ++++++++++++++++++++++++++--------------------------------
zh_TW.po | 463 ++++++++++++++++++++++++++--------------------------------
86 files changed, 17538 insertions(+), 22440 deletions(-)
diff --git a/ach.po b/ach.po
index 5fd6e41ff..1291130b6 100644
--- a/ach.po
+++ b/ach.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Acoli (http://www.transifex.com/otf/torproject/language/ach/)\n"
"MIME-Version: 1.0\n"
@@ -95,80 +95,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -709,6 +523,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1091,6 +910,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/af.po b/af.po
index 55451f00e..d5de55736 100644
--- a/af.po
+++ b/af.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Afrikaans (http://www.transifex.com/otf/torproject/language/af/)\n"
"MIME-Version: 1.0\n"
@@ -95,80 +95,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -709,6 +523,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1091,6 +910,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/ar.po b/ar.po
index 6ed164102..b990cd2d5 100644
--- a/ar.po
+++ b/ar.po
@@ -31,8 +31,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Arabic (http://www.transifex.com/otf/torproject/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -119,80 +119,82 @@ msgstr "_Launch"
msgid "_Exit"
msgstr "_Exit"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -200,7 +202,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -208,7 +210,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -216,225 +218,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -733,6 +547,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "هذه النسخة من تيلز تحتوي مشاكل أمنية:"
@@ -829,35 +648,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -866,14 +685,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -882,42 +701,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1115,6 +934,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/ast.po b/ast.po
index 07d6930eb..290b38d5f 100644
--- a/ast.po
+++ b/ast.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Asturian (http://www.transifex.com/otf/torproject/language/ast/)\n"
"MIME-Version: 1.0\n"
@@ -95,80 +95,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -709,6 +523,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1091,6 +910,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/az.po b/az.po
index f3df4cd59..7d11fff7d 100644
--- a/az.po
+++ b/az.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Azerbaijani (http://www.transifex.com/otf/torproject/language/az/)\n"
"MIME-Version: 1.0\n"
@@ -96,80 +96,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -177,7 +179,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -185,7 +187,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -193,225 +195,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -710,6 +524,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -806,35 +625,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -843,14 +662,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -859,42 +678,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1092,6 +911,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/be.po b/be.po
index efa65fcf1..e5c115f8b 100644
--- a/be.po
+++ b/be.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Belarusian (http://www.transifex.com/otf/torproject/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -95,80 +95,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -709,6 +523,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1091,6 +910,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/bg.po b/bg.po
index 19e5dcfc1..b5c631cce 100644
--- a/bg.po
+++ b/bg.po
@@ -19,8 +19,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Bulgarian (http://www.transifex.com/otf/torproject/language/bg/)\n"
"MIME-Version: 1.0\n"
@@ -107,80 +107,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -188,7 +190,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -196,7 +198,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -204,225 +206,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -721,6 +535,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -817,35 +636,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -854,14 +673,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -870,42 +689,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1103,6 +922,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/bn.po b/bn.po
index 40fbe9433..bc0808515 100644
--- a/bn.po
+++ b/bn.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Bengali (http://www.transifex.com/otf/torproject/language/bn/)\n"
"MIME-Version: 1.0\n"
@@ -98,80 +98,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -179,7 +181,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -187,7 +189,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -195,225 +197,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -712,6 +526,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -808,35 +627,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -845,14 +664,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -861,42 +680,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1094,6 +913,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/br.po b/br.po
index 5a6042128..94ade3fe0 100644
--- a/br.po
+++ b/br.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Breton (http://www.transifex.com/otf/torproject/language/br/)\n"
"MIME-Version: 1.0\n"
@@ -96,80 +96,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -177,7 +179,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -185,7 +187,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -193,225 +195,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -710,6 +524,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -806,35 +625,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -843,14 +662,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -859,42 +678,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1092,6 +911,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/bs.po b/bs.po
index d32f83aae..9868c3f26 100644
--- a/bs.po
+++ b/bs.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Bosnian (http://www.transifex.com/otf/torproject/language/bs/)\n"
"MIME-Version: 1.0\n"
@@ -95,80 +95,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -709,6 +523,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1091,6 +910,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/ca.po b/ca.po
index e7cdb94dc..bea7f78a2 100644
--- a/ca.po
+++ b/ca.po
@@ -24,8 +24,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -112,80 +112,82 @@ msgstr "_Executa"
msgid "_Exit"
msgstr "_Surt"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "Cancel·la"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Cancel·la"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -193,7 +195,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -201,7 +203,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -209,225 +211,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -726,6 +540,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Aquesta versió de Tails té problemes de seguretat coneguts:"
@@ -822,35 +641,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -859,14 +678,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -875,42 +694,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1108,6 +927,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/cs.po b/cs.po
index 4c33968e8..2b1e871a1 100644
--- a/cs.po
+++ b/cs.po
@@ -20,8 +20,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n"
"MIME-Version: 1.0\n"
@@ -108,80 +108,82 @@ msgstr "_Spustit"
msgid "_Exit"
msgstr "_Odejít"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "Zrušit"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Zrušit"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -189,7 +191,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -197,7 +199,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -205,225 +207,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -722,6 +536,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Tato verze Tails obsahuje následující bezpečnostní problémy:"
@@ -818,35 +637,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -855,14 +674,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -871,42 +690,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1104,6 +923,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/cy.po b/cy.po
index 4083fe5e8..af97bb779 100644
--- a/cy.po
+++ b/cy.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Welsh (http://www.transifex.com/otf/torproject/language/cy/)\n"
"MIME-Version: 1.0\n"
@@ -98,80 +98,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -179,7 +181,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -187,7 +189,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -195,225 +197,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -712,6 +526,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -808,35 +627,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -845,14 +664,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -861,42 +680,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1094,6 +913,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/da.po b/da.po
index 74fe3e9a7..3466d2c38 100644
--- a/da.po
+++ b/da.po
@@ -20,8 +20,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n"
"MIME-Version: 1.0\n"
@@ -108,80 +108,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -189,7 +191,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -197,7 +199,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -205,225 +207,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -722,6 +536,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -818,35 +637,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -855,14 +674,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -871,42 +690,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1104,6 +923,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/de.po b/de.po
index 81ac91e14..6b4583fab 100644
--- a/de.po
+++ b/de.po
@@ -36,8 +36,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n"
"MIME-Version: 1.0\n"
@@ -124,80 +124,82 @@ msgstr "_Start"
msgid "_Exit"
msgstr "_Beenden"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Abbrechen"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -205,7 +207,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -213,7 +215,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -221,225 +223,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Bestätigen"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -738,6 +552,11 @@ msgstr ""
msgid "Password"
msgstr "Passwort"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Bestätigen"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Diese Tails-Version weist Sicherheitslücken auf:"
@@ -834,35 +653,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -871,14 +690,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -887,42 +706,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1120,6 +939,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/el.po b/el.po
index df6b2828a..90953bf79 100644
--- a/el.po
+++ b/el.po
@@ -28,8 +28,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -116,80 +116,82 @@ msgstr "_Εκκίνηση"
msgid "_Exit"
msgstr "_Έξοδος"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -197,7 +199,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -205,7 +207,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -213,225 +215,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Επιβεβαίωση"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -730,6 +544,11 @@ msgstr ""
msgid "Password"
msgstr "Κωδικός ασφαλείας"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Επιβεβαίωση"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -826,35 +645,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -863,14 +682,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -879,42 +698,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1112,6 +931,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/en_GB.po b/en_GB.po
index 8e3aba645..cdf2ce9e8 100644
--- a/en_GB.po
+++ b/en_GB.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/otf/torproject/language/en_GB/)\n"
"MIME-Version: 1.0\n"
@@ -99,80 +99,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -180,7 +182,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -188,7 +190,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -196,225 +198,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -713,6 +527,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -809,35 +628,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -846,14 +665,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -862,42 +681,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1095,6 +914,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/eo.po b/eo.po
index 9adb998b0..395f52db2 100644
--- a/eo.po
+++ b/eo.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Esperanto (http://www.transifex.com/otf/torproject/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -96,80 +96,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -177,7 +179,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -185,7 +187,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -193,225 +195,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -710,6 +524,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -806,35 +625,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -843,14 +662,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -859,42 +678,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1092,6 +911,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/es.po b/es.po
index 9378cbee9..be9165530 100644
--- a/es.po
+++ b/es.po
@@ -17,9 +17,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 17:21+0000\n"
-"Last-Translator: eulalio barbero espinosa <eulaliob at gmail.com>\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 at anhalt.org>\n"
"Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -105,80 +105,82 @@ msgstr "_Iniciar"
msgid "_Exit"
msgstr "_Salir"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
-msgstr "Directa (predeterminado)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Puente y proxy"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Desconectado"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "Desbloquear"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "No se pudo volver a bloquear el almacenamiento persistente."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "Desbloqueando..."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "No se puede desbloquear el almacenamiento cifrado con esta frase-contraseña."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "Configuración adicional"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "Cancelar"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "Añadir"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "Volver"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr " _Contraseña de administración"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_Falseamiento de dirección MAC "
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "Conexión de _red"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Directa (predeterminado)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Puente y proxy"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Desconectado"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "Activada (predeterminado)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Activado"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Desactivado"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr " Desactivada (predeterminado) "
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Cerrar"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr "_Iniciar Tails"
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "default:LTR"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr "live-persist falló con un código de retorno {returncode}:\n{stderr} "
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
"{stderr}"
msgstr "cryptsetup falló con un código de retorno {returncode}:\n{stdout}\n{stderr} "
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -194,7 +196,7 @@ msgid ""
"{stderr}"
msgstr "live-persist falló con código de retorno {returncode}:\n{stdout}\n{stderr} "
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -202,225 +204,37 @@ msgid ""
"{stderr}"
msgstr "umount falló con un código de retorno {returncode}\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "Contraseña de administración"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "Establece una contraseña de administración si necesitas realizar tareas administrativas. De lo contrario la contraseña de administración se deshabilitará para mayor seguridad."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Introduce una contraseña de administración"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Confirmar"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Confirma tu contraseña de administración"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Deshabilitar"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Camuflaje como Windows"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "Esta opción hace que Tails tenga el aspecto de Microsoft Windows 10. Esto puede resultar útil para evitar atraer sospechas en lugares públicos."
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "Camuflaje como Microsoft Windows 10"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "Falseamiento de dirección MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "El falseamiento de la dirección MAC oculta el número de serie de tu interfaz de red (Wi-Fi o cableada) hacia la red local. Falsear la dirección MAC generalmente es más seguro ya que ayuda a ocultar la ubicación geográfica. Pero también podría crear problemas de conectividad o resultar sospechoso."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Falsear todas las direcciones MAC (predeterminado)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "No falsear direcciones MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "Configurarás el puente de Tor y un proxy local posteriormente, tras conectar a la red."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "¡Bienvenido a Tails!"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "Para hacer una visita guiada a la configuración de Tails, pulsa <b>Hacer un recorrido</b> "
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "Desbloquear"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Idioma y región"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "No se pudo volver a bloquear el almacenamiento persistente."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Configuración predeterminada"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "Desbloqueando..."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Guardar configuración de idioma y regional"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "No se puede desbloquear el almacenamiento cifrado con esta frase-contraseña."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "_Idioma"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "_Configuración del teclado"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "_Formatos"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Zona horaria"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Almacenamiento _Persistente Cifrado"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Mostrar frase-contraseña"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Configurar Almacenamiento Persistente"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "Introduce tu frase contraseña para desbloquear el almacenamiento persistente"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Bloquear de nuevo el almacenamiento persistente"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "Tu almacenamiento persistente está desbloqueado. Reinicia Tails para volver a bloquearlo."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_Configuración adicional"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Guardar configuración adicional "
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Añadir una configuración adicional"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "Configuración de la red"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "Si tu conexión a Internet está censurada, filtrada, o se conecta por proxy, puedes configurar un puente de red Tor o un proxy local. Para trabajar completamente desconectado, puedes deshabilitar todas las conexiones de red."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Conectar directamente a la red Tor (predeterminado)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Configura un puente Tor o un proxy local"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Deshabilitar todas las conexiones de red "
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr "La configuración predeterminada es segura en la mayoría de los casos. Para añadir una configuración personalizada, pulsa debajo el botón \"+\". "
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr " _Contraseña de administración"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr " Desactivada (predeterminado) "
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_Falseamiento de dirección MAC "
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "Activada (predeterminado)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "Conexión de _red"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "Camuflaje como _Windows"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Activado"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Desactivado"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -719,6 +533,11 @@ msgstr "Establece una contraseña para desbloquear la pantalla"
msgid "Password"
msgstr "Contraseña"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Confirmar"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Esta versión de Tails tiene problemas de seguridad conocidos:"
@@ -815,35 +634,35 @@ msgstr "Abrir Onion Circuits"
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr "{volume_label} ({volume_size})"
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr "{partition_name} ({partition_size})"
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr "{volume_size} Volumen"
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr "{volume_name} (Sólo lectura)"
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr "{partition_name} en {container_path}"
@@ -852,14 +671,14 @@ msgstr "{partition_name} en {container_path}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr "{volume_name} – {path_to_file_container}"
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr "{partition_name} en {drive_name}"
@@ -868,42 +687,42 @@ msgstr "{partition_name} en {drive_name}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr "{volume_name} – {drive_name}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr "Contraseña o parámetros incorrectos"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr "Error al desbloquear el volumen"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr "No se pudo desbloquear el volumen {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr "Una o más aplicaciones tienen el volumen ocupado."
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr "No se pudo bloquear el volumen {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr "El bloqueo del volumen falló"
@@ -1101,6 +920,130 @@ msgid ""
" ($(command_line))"
msgstr "Se requiere autenticación para quitar un paquete de su software adicional ($ (command_line))"
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "Contraseña de administración"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "Establece una contraseña de administración si necesitas realizar tareas administrativas. De lo contrario la contraseña de administración se deshabilitará para mayor seguridad."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Introduce una contraseña de administración"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Confirma tu contraseña de administración"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Deshabilitar"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "Falseamiento de dirección MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "El falseamiento de la dirección MAC oculta el número de serie de tu interfaz de red (Wi-Fi o cableada) hacia la red local. Falsear la dirección MAC generalmente es más seguro ya que ayuda a ocultar la ubicación geográfica. Pero también podría crear problemas de conectividad o resultar sospechoso."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Falsear todas las direcciones MAC (predeterminado)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "No falsear direcciones MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Configuración de la red"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "Si tu conexión a Internet está censurada, filtrada, o se conecta por proxy, puedes configurar un puente de red Tor o un proxy local. Para trabajar completamente desconectado, puedes deshabilitar todas las conexiones de red."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Conectar directamente a la red Tor (predeterminado)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Configura un puente Tor o un proxy local"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Deshabilitar todas las conexiones de red "
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "Configurarás el puente de Tor y un proxy local posteriormente, tras conectar a la red."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "¡Bienvenido a Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Idioma y región"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Configuración predeterminada"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Almacenamiento _Persistente Cifrado"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Configurar Almacenamiento Persistente"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "Introduce tu frase contraseña para desbloquear el almacenamiento persistente"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Bloquear de nuevo el almacenamiento persistente"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "Tu almacenamiento persistente está desbloqueado. Reinicia Tails para volver a bloquearlo."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_Configuración adicional"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Añadir una configuración adicional"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "La configuración predeterminada es segura en la mayoría de los casos. Para añadir una configuración personalizada, pulsa debajo el botón \"+\". "
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr "Contenedores de archivos"
diff --git a/es_AR.po b/es_AR.po
index 662beee46..e12504cd7 100644
--- a/es_AR.po
+++ b/es_AR.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/otf/torproject/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -101,80 +101,82 @@ msgstr "_Iniciar"
msgid "_Exit"
msgstr "_Salir"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Cancelar"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -182,7 +184,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -190,7 +192,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -198,225 +200,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Confirmar"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -715,6 +529,11 @@ msgstr "Definí una contraseña para desbloquear la pantalla."
msgid "Password"
msgstr "Contraseña"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Confirmar"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Esta versión de Tails tiene problemas de seguridad conocidos:"
@@ -811,35 +630,35 @@ msgstr "Abrir circuitos Onion"
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr "{volume_label} ({volume_size})"
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr "{partition_name} ({partition_size})"
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr "{volume_size} Volumen"
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr "{volume_name} (Sólo-Lectura)"
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr "{partition_name} en {container_path}"
@@ -848,14 +667,14 @@ msgstr "{partition_name} en {container_path}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr "{volume_name} – {path_to_file_container}"
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr "{partition_name} en {drive_name}"
@@ -864,42 +683,42 @@ msgstr "{partition_name} en {drive_name}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr "{volume_name} – {drive_name}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr "Frase de contraseña o parámetros erróneos"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr "Error desbloqueando volumen"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr "No se pudo desbloquear volumen {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1097,6 +916,130 @@ msgid ""
" ($(command_line))"
msgstr "Se requiere autenticación para remover un paquete de tus programas adicionales ($(command_line))"
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr "Contenedores de archivo"
diff --git a/es_MX.po b/es_MX.po
index 2313fbc23..087ed06fd 100644
--- a/es_MX.po
+++ b/es_MX.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Spanish (Mexico) (http://www.transifex.com/otf/torproject/language/es_MX/)\n"
"MIME-Version: 1.0\n"
@@ -97,80 +97,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -178,7 +180,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -194,225 +196,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -711,6 +525,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -807,35 +626,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -844,14 +663,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -860,42 +679,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1093,6 +912,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/et.po b/et.po
index e43ea178a..31da6b404 100644
--- a/et.po
+++ b/et.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Estonian (http://www.transifex.com/otf/torproject/language/et/)\n"
"MIME-Version: 1.0\n"
@@ -97,80 +97,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -178,7 +180,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -194,225 +196,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -711,6 +525,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -807,35 +626,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -844,14 +663,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -860,42 +679,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1093,6 +912,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/eu.po b/eu.po
index 6e1fd73c4..f056e4a2f 100644
--- a/eu.po
+++ b/eu.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Basque (http://www.transifex.com/otf/torproject/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -102,80 +102,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -183,7 +185,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -191,7 +193,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -199,225 +201,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -716,6 +530,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -812,35 +631,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -849,14 +668,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -865,42 +684,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1098,6 +917,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/fa.po b/fa.po
index d721c99a8..e16cdc089 100644
--- a/fa.po
+++ b/fa.po
@@ -33,8 +33,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Persian (http://www.transifex.com/otf/torproject/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -121,80 +121,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -202,7 +204,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -210,7 +212,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -218,225 +220,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -735,6 +549,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -831,35 +650,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -868,14 +687,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -884,42 +703,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1117,6 +936,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/fi.po b/fi.po
index e2337b57f..94d05f381 100644
--- a/fi.po
+++ b/fi.po
@@ -17,8 +17,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Finnish (http://www.transifex.com/otf/torproject/language/fi/)\n"
"MIME-Version: 1.0\n"
@@ -105,80 +105,82 @@ msgstr "_Käynnistä"
msgid "_Exit"
msgstr "_Lopeta"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "Peruuta"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Peruuta"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -194,7 +196,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -202,225 +204,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -719,6 +533,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Tässä Tails-versiossa on tunnettuja turvallisuusriskejä:"
@@ -815,35 +634,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -852,14 +671,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -868,42 +687,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1101,6 +920,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/fr.po b/fr.po
index 6d618f2a3..696ce466a 100644
--- a/fr.po
+++ b/fr.po
@@ -39,8 +39,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n"
"MIME-Version: 1.0\n"
@@ -127,80 +127,82 @@ msgstr "_Lancer"
msgid "_Exit"
msgstr "_Quitter"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
-msgstr "Directe (par défaut)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Pont (bridge) et serveur mandataire (proxy)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Hors ligne"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "Déverrouiller"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Échec de reverrouillage du stockage persistant."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "Déverrouillage..."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "Cette phrase de passe ne permet pas de déverrouiller le stockage chiffré."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "Paramètres supplémentaires"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "Annuler"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "Ajouter"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "Précédent"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "_Mot de passe d’administration"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_Usurpation d’adresse MAC"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "Connexion _réseau"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Directe (par défaut)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Pont (bridge) et serveur mandataire (proxy)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Hors ligne"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "Activé (par défaut)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Activé"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Désactivé"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Désactivé (par défaut)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Éteindre"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr "_Démarrer Tails"
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "default:LTR"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr "Échec de live-persist avec le code de retour {returncode}:\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -208,7 +210,7 @@ msgid ""
"{stderr}"
msgstr "cryptsetup a échoué avec le code de retour {returncode} :\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -216,7 +218,7 @@ msgid ""
"{stderr}"
msgstr "Échec de live-persist avec le code de retour {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -224,225 +226,37 @@ msgid ""
"{stderr}"
msgstr "umount a échoué avec le code de retour {returncode} :\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "Mot de passe d’administration"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "Définir un mot de passe d’administration si vous devez effectuer des tâches administratives. Sinon, le mot de passe d’administration est désactivé pour une sécurité accrue."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Saisir un mot de passe d’administration"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Confirmer"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Confirmer votre mot de passe d’administration"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Désactiver"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Camouflage Windows"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "Avec cette option, Tails ressemble à Microsoft Windows 10, ce qui peut se révéler utile pour éviter d’attirer les soupçons dans les lieux publics."
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "Camouflage en Microsoft Windows 10"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "Usurpation d’adresse MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "L’usurpation d’adresse MAC dissimule au réseau local le numéro de série de votre interface réseau (Wi-Fi ou filaire). L’usurpation d’adresse MAC est généralement plus sûre, car elle vous aide à dissimuler votre position géographique. Mais elle peut aussi créer des problèmes de connectivité et sembler suspect."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Usurper toutes les adresses MAC (par défaut)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "Ne pas usurper les adresses MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "Vous configurerez le pont (bridge) Tor et le serveur mandataire (proxy) local plus tard, après vous être connecté à un réseau."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Bienvenue dans Tails !"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "Pour découvrir les paramètres de Tails, cliquez sur <b>Visite guidée</b> ci-dessus"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "Déverrouiller"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Langue et région"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Échec de reverrouillage du stockage persistant."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Paramètres par défaut"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "Déverrouillage..."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Enregistrer les paramètres de langue et de région"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "Cette phrase de passe ne permet pas de déverrouiller le stockage chiffré."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "_Langue"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "Disposition du _clavier"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "_Formats"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "Fuseau _horaire"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "_Stockage persistant chiffré"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Afficher la phrase de passe"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Configurer le stockage persistant"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "Saisir votre phrase de passe pour déverrouiller le stockage persistant"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Reverrouiller le stockage persistant"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "Votre stockage persistant est déverrouillé. Redémarrez Tails pour le verrouiller à nouveau."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_Paramètres supplémentaires"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Enregistrer les paramètres supplémentaires"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Ajouter un paramètre supplémentaire"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "Configuration du réseau"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "Si votre connexion Internet est censurée, filtrée ou relayée par un serveur mandataire (proxy), vous pouvez configurer un pont (bridge) Tor ou un serveur mandataire (proxy) local. Pour travailler complètement hors ligne, vous pouvez désactiver le réseau."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Se connecter directement au réseau Tor (par défaut)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Configurer un pont (bridge) Tor ou un serveur mandataire (proxy) local"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Désactiver le réseau"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr "Les paramètres par défaut sont sûrs dans la plupart des cas. Pour ajouter un paramètre personnalisé, appuyer sur le bouton \"+\" ci-dessous."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Mot de passe d’administration"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "Désactivé (par défaut)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_Usurpation d’adresse MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "Activé (par défaut)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "Connexion _réseau"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "Camouflage _Windows"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Activé"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Désactivé"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -741,6 +555,11 @@ msgstr "Définir un mot de passe pour déverrouiller l’écran"
msgid "Password"
msgstr "Mot de passe"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Confirmer"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Cette version de Tails a des problèmes de sécurité connus :"
@@ -837,35 +656,35 @@ msgstr "Ouvrir Onion Circuits"
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr "{volume_label} ({volume_size})"
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr "{partition_name} ({partition_size})"
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr "Volume de {volume_size}"
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr "{volume_name} (lecture seule)"
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr "{partition_name} dans {container_path}"
@@ -874,14 +693,14 @@ msgstr "{partition_name} dans {container_path}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr "{volume_name} – {path_to_file_container}"
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr "{partition_name} sur {drive_name}"
@@ -890,42 +709,42 @@ msgstr "{partition_name} sur {drive_name}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr "{volume_name} – {drive_name}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr "Mauvaise phrase de passe ou mauvais paramètres"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr "Erreur de déverrouillage du volume"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr "Impossible de déverrouiller le volume {volume_name} :\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr "Une ou plusieurs applications tiennent le volume occupé."
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr "Impossible de verrouiller le volume {volume_name} :\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr "Échec de verrouillage du volume"
@@ -1123,6 +942,130 @@ msgid ""
" ($(command_line))"
msgstr "Une authentification est nécessaire pour enlever un paquet depuis vos logiciels additionnels ($(command_line))"
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "Mot de passe d’administration"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "Définir un mot de passe d’administration si vous devez effectuer des tâches administratives. Sinon, le mot de passe d’administration est désactivé pour une sécurité accrue."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Saisir un mot de passe d’administration"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Confirmer votre mot de passe d’administration"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Désactiver"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "Usurpation d’adresse MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "L’usurpation d’adresse MAC dissimule au réseau local le numéro de série de votre interface réseau (Wi-Fi ou filaire). L’usurpation d’adresse MAC est généralement plus sûre, car elle vous aide à dissimuler votre position géographique. Mais elle peut aussi créer des problèmes de connectivité et sembler suspect."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Usurper toutes les adresses MAC (par défaut)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "Ne pas usurper les adresses MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Configuration du réseau"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "Si votre connexion Internet est censurée, filtrée ou relayée par un serveur mandataire (proxy), vous pouvez configurer un pont (bridge) Tor ou un serveur mandataire (proxy) local. Pour travailler complètement hors ligne, vous pouvez désactiver le réseau."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Se connecter directement au réseau Tor (par défaut)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Configurer un pont (bridge) Tor ou un serveur mandataire (proxy) local"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Désactiver le réseau"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "Vous configurerez le pont (bridge) Tor et le serveur mandataire (proxy) local plus tard, après vous être connecté à un réseau."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Bienvenue dans Tails !"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Langue et région"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Paramètres par défaut"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "_Stockage persistant chiffré"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Configurer le stockage persistant"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "Saisir votre phrase de passe pour déverrouiller le stockage persistant"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Reverrouiller le stockage persistant"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "Votre stockage persistant est déverrouillé. Redémarrez Tails pour le verrouiller à nouveau."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_Paramètres supplémentaires"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Ajouter un paramètre supplémentaire"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "Les paramètres par défaut sont sûrs dans la plupart des cas. Pour ajouter un paramètre personnalisé, appuyer sur le bouton \"+\" ci-dessous."
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr "Fichiers conteneurs"
diff --git a/fy.po b/fy.po
index 669ef74f0..1f4407c2e 100644
--- a/fy.po
+++ b/fy.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Western Frisian (http://www.transifex.com/otf/torproject/language/fy/)\n"
"MIME-Version: 1.0\n"
@@ -96,80 +96,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -177,7 +179,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -185,7 +187,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -193,225 +195,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -710,6 +524,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -806,35 +625,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -843,14 +662,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -859,42 +678,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1092,6 +911,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/ga.po b/ga.po
index 87ae7ab04..5093acd47 100644
--- a/ga.po
+++ b/ga.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Irish (http://www.transifex.com/otf/torproject/language/ga/)\n"
"MIME-Version: 1.0\n"
@@ -97,80 +97,82 @@ msgstr "_Tosaigh"
msgid "_Exit"
msgstr "_Scoir"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "Cealaigh"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Cealaigh"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -178,7 +180,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -194,225 +196,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Deimhnigh"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -711,6 +525,11 @@ msgstr "Socraigh focal faire chun an scáileán a dhíghlasáil."
msgid "Password"
msgstr "Focal faire"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Deimhnigh"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Tá fadhbanna slándála sa leagan seo de Tails:"
@@ -807,35 +626,35 @@ msgstr "Ciorcaid Onion Oscailte"
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr "{volume_label} ({volume_size})"
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr "{partition_name} ({partition_size})"
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr "Imleabhar {volume_size}"
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr "{volume_name} (Inléite Amháin)"
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr "{partition_name} in {container_path}"
@@ -844,14 +663,14 @@ msgstr "{partition_name} in {container_path}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr "{volume_name} – {path_to_file_container}"
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr "{partition_name} ar {drive_name}"
@@ -860,42 +679,42 @@ msgstr "{partition_name} ar {drive_name}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr "{volume_name} – {drive_name}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr "Frása faire mícheart nó paraiméadair mhíchearta"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr "Earráid agus an t-imleabhar á dhíghlasáil"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr "Níorbh fhéidir imleabhar {volume_name}: a dhíghlasáil:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1093,6 +912,130 @@ msgid ""
" ($(command_line))"
msgstr "Caithfidh tú d'fhocal faire a thabhairt chun pacáiste de na bogearraí breise a bhaint ($(command_line))"
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr "Coimeádáin"
diff --git a/gd.po b/gd.po
index 3a7e0f742..86c4cfae1 100644
--- a/gd.po
+++ b/gd.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Gaelic, Scottish (http://www.transifex.com/otf/torproject/language/gd/)\n"
"MIME-Version: 1.0\n"
@@ -95,80 +95,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -709,6 +523,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1091,6 +910,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/gl.po b/gl.po
index ef276cd67..8c3167aaf 100644
--- a/gl.po
+++ b/gl.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Galician (http://www.transifex.com/otf/torproject/language/gl/)\n"
"MIME-Version: 1.0\n"
@@ -98,80 +98,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -179,7 +181,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -187,7 +189,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -195,225 +197,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -712,6 +526,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -808,35 +627,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -845,14 +664,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -861,42 +680,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1094,6 +913,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/gu.po b/gu.po
index 9af2cc746..088fddc81 100644
--- a/gu.po
+++ b/gu.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Gujarati (http://www.transifex.com/otf/torproject/language/gu/)\n"
"MIME-Version: 1.0\n"
@@ -95,80 +95,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -709,6 +523,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1091,6 +910,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/he.po b/he.po
index 7aff3d8d2..1268d380c 100644
--- a/he.po
+++ b/he.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -102,80 +102,82 @@ msgstr "_הפעל"
msgid "_Exit"
msgstr "_צא"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "בטל"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "בטל"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -183,7 +185,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -191,7 +193,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -199,225 +201,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "אשר"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -716,6 +530,11 @@ msgstr "קבע סיסמה לביטול נעילת המסך."
msgid "Password"
msgstr "סיסמה"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "אשר"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "לגרסה זו של Tails יש סוגיות אבטחה ידועות:"
@@ -812,35 +631,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -849,14 +668,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -865,42 +684,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1098,6 +917,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/hi.po b/hi.po
index 6bad25c4d..df20a2b92 100644
--- a/hi.po
+++ b/hi.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Hindi (http://www.transifex.com/otf/torproject/language/hi/)\n"
"MIME-Version: 1.0\n"
@@ -97,80 +97,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -178,7 +180,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -194,225 +196,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -711,6 +525,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -807,35 +626,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -844,14 +663,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -860,42 +679,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1093,6 +912,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/hr.po b/hr.po
index f6b127956..4918a7ac2 100644
--- a/hr.po
+++ b/hr.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Croatian (http://www.transifex.com/otf/torproject/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -96,80 +96,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -177,7 +179,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -185,7 +187,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -193,225 +195,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -710,6 +524,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -806,35 +625,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -843,14 +662,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -859,42 +678,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1092,6 +911,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/hu.po b/hu.po
index 74e4d3db9..b887c4377 100644
--- a/hu.po
+++ b/hu.po
@@ -16,8 +16,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/hu/)\n"
"MIME-Version: 1.0\n"
@@ -104,80 +104,82 @@ msgstr "_Indítás"
msgid "_Exit"
msgstr "_Kilépés"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "Mégse"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Mégse"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -185,7 +187,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -193,7 +195,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -201,225 +203,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Megerősít"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -718,6 +532,11 @@ msgstr "Adjon meg jelszót a képernyő feloldáshoz."
msgid "Password"
msgstr "Jelszó"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Megerősít"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "A Tails ezen verziója ismert biztonsági problémákkal rendelkezik:"
@@ -814,35 +633,35 @@ msgstr "Nyitott Onion Áramkörök"
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr "{volume_label} ({volume_size})"
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr "{partition_name} ({partition_size})"
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr "{volume_size} Volume"
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr "{volume_name} (csak olvasható)"
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr "{partition_name} a {container_path} útvonalon"
@@ -851,14 +670,14 @@ msgstr "{partition_name} a {container_path} útvonalon"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr "{volume_name} – {path_to_file_container}"
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr "{partition_name} a {drive_name} drive-on"
@@ -867,42 +686,42 @@ msgstr "{partition_name} a {drive_name} drive-on"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr "{volume_name} – {drive_name}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr "Rossz jelszó vagy paraméterek"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr "Hiba a kötet feloldása során"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr "Sikertelen a(z) {volume_name} kötet feloldása:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1100,6 +919,130 @@ msgid ""
" ($(command_line))"
msgstr "Azonosítás szükséges a további szoftverei közül egy csomag eltávolításához ($(command_line))"
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr "Fájl konténerek"
diff --git a/hy.po b/hy.po
index 111c154d3..a847b3861 100644
--- a/hy.po
+++ b/hy.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Armenian (http://www.transifex.com/otf/torproject/language/hy/)\n"
"MIME-Version: 1.0\n"
@@ -96,80 +96,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -177,7 +179,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -185,7 +187,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -193,225 +195,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -710,6 +524,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -806,35 +625,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -843,14 +662,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -859,42 +678,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1092,6 +911,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/id.po b/id.po
index f9cfafa36..1d8c85ec8 100644
--- a/id.po
+++ b/id.po
@@ -20,8 +20,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Indonesian (http://www.transifex.com/otf/torproject/language/id/)\n"
"MIME-Version: 1.0\n"
@@ -108,80 +108,82 @@ msgstr "_Luncurkan"
msgid "_Exit"
msgstr "_Keluar"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -189,7 +191,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -197,7 +199,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -205,225 +207,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -722,6 +536,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -818,35 +637,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -855,14 +674,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -871,42 +690,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1104,6 +923,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/is.po b/is.po
index e7e214ce5..23c7814f7 100644
--- a/is.po
+++ b/is.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Icelandic (http://www.transifex.com/otf/torproject/language/is/)\n"
"MIME-Version: 1.0\n"
@@ -96,80 +96,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -177,7 +179,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -185,7 +187,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -193,225 +195,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -710,6 +524,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -806,35 +625,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -843,14 +662,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -859,42 +678,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1092,6 +911,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/it.po b/it.po
index 62d5f4abc..f36330f6f 100644
--- a/it.po
+++ b/it.po
@@ -32,8 +32,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Italian (http://www.transifex.com/otf/torproject/language/it/)\n"
"MIME-Version: 1.0\n"
@@ -120,80 +120,82 @@ msgstr "_Avvia"
msgid "_Exit"
msgstr "_Esci"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
-msgstr "Diretta (predefinito)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "Annulla"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "_Password di amministratore"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "Spoofing indirizzo _MAC"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_Connessioni di rete"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Diretta (predefinito)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "On (predefinito)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "On"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Off"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Off (predefinito)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -201,7 +203,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -209,7 +211,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -217,225 +219,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Conferma"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Configura volume persistente"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "Inserisci la tua passphrase per sbloccare il volume persistente"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Riblocca volume persistente"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "Il tuo volume persistente è sbloccato. Riavvia Tails per ribloccarlo."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_Impostazioni aggiuntive"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "Configurazione di rete"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr "Le impostazioni predefinite vanno bene nella maggior parte dei casi. Per aggiungere un'impostazione personale, premi il pulsante \"+\" sotto."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Password di amministratore"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "Off (predefinito)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "Spoofing indirizzo _MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "On (predefinito)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_Connessioni di rete"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "Mimetizzazione _Windows"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "On"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Off"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -734,6 +548,11 @@ msgstr "Imposta una password per sbloccare lo schermo."
msgid "Password"
msgstr "Password"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Conferma"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Questa versione di Tails ha problemi di sicurezza noti:"
@@ -830,35 +649,35 @@ msgstr "Apri Circuiti Onion"
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr "{volume_label} ({volume_size})"
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr "{partition_name} ({partition_size})"
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr "{volume_size} Volume"
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr "{volume_name} (Sola lettura)"
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr "{partition_name} in {container_path}"
@@ -867,14 +686,14 @@ msgstr "{partition_name} in {container_path}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr "{volume_name} – {path_to_file_container}"
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr "{partition_name} su {drive_name}"
@@ -883,42 +702,42 @@ msgstr "{partition_name} su {drive_name}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr "{volume_name} – {drive_name}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr "Password o parametri non corretti"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr "Errore sblocco volume"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr "Impossibile sbloccare il volume {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr "Una o più applicazioni stanno tenendo occupato il volume."
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr "Impossibile bloccare il volume {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr "Blocco del volume fallito"
@@ -1116,6 +935,130 @@ msgid ""
" ($(command_line))"
msgstr "È richiesta l'autenticazione per rimuovere un pacchetto dai tuoi software aggiuntivi ($(command_line))"
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Configurazione di rete"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Configura volume persistente"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "Inserisci la tua passphrase per sbloccare il volume persistente"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Riblocca volume persistente"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "Il tuo volume persistente è sbloccato. Riavvia Tails per ribloccarlo."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_Impostazioni aggiuntive"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "Le impostazioni predefinite vanno bene nella maggior parte dei casi. Per aggiungere un'impostazione personale, premi il pulsante \"+\" sotto."
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr "Contenitori di file"
diff --git a/ja.po b/ja.po
index 6bc6d09b0..3f3e4c14a 100644
--- a/ja.po
+++ b/ja.po
@@ -26,8 +26,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Japanese (http://www.transifex.com/otf/torproject/language/ja/)\n"
"MIME-Version: 1.0\n"
@@ -114,80 +114,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -195,7 +197,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -203,7 +205,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -211,225 +213,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -728,6 +542,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -824,35 +643,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -861,14 +680,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -877,42 +696,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1110,6 +929,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/ka.po b/ka.po
index 45692db4d..a66027b99 100644
--- a/ka.po
+++ b/ka.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Georgian (http://www.transifex.com/otf/torproject/language/ka/)\n"
"MIME-Version: 1.0\n"
@@ -98,80 +98,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -179,7 +181,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -187,7 +189,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -195,225 +197,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -712,6 +526,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -808,35 +627,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -845,14 +664,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -861,42 +680,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1094,6 +913,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/kab.po b/kab.po
index cb869557c..feb1c5e98 100644
--- a/kab.po
+++ b/kab.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Kabyle (http://www.transifex.com/otf/torproject/language/kab/)\n"
"MIME-Version: 1.0\n"
@@ -95,80 +95,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -709,6 +523,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1091,6 +910,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/kk.po b/kk.po
index d14cc7187..3d028e9ae 100644
--- a/kk.po
+++ b/kk.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Kazakh (http://www.transifex.com/otf/torproject/language/kk/)\n"
"MIME-Version: 1.0\n"
@@ -97,80 +97,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -178,7 +180,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -194,225 +196,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -711,6 +525,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -807,35 +626,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -844,14 +663,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -860,42 +679,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1093,6 +912,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/km.po b/km.po
index ee5ea8989..1abffbc9f 100644
--- a/km.po
+++ b/km.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Khmer (http://www.transifex.com/otf/torproject/language/km/)\n"
"MIME-Version: 1.0\n"
@@ -97,80 +97,82 @@ msgstr "ចាប់ផ្ដើម"
msgid "_Exit"
msgstr "ចេញ"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "បោះបង់"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "បោះបង់"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -178,7 +180,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -194,225 +196,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -711,6 +525,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "កំណែរបស់ Tails នេះគឺស្គាល់បញ្ហាសុវត្ថិភាព៖"
@@ -807,35 +626,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -844,14 +663,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -860,42 +679,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1093,6 +912,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/kn.po b/kn.po
index 3a8964141..9379377e3 100644
--- a/kn.po
+++ b/kn.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Kannada (http://www.transifex.com/otf/torproject/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -96,80 +96,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -177,7 +179,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -185,7 +187,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -193,225 +195,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -710,6 +524,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -806,35 +625,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -843,14 +662,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -859,42 +678,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1092,6 +911,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/ko.po b/ko.po
index 5638cdbc1..fa376bdda 100644
--- a/ko.po
+++ b/ko.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Korean (http://www.transifex.com/otf/torproject/language/ko/)\n"
"MIME-Version: 1.0\n"
@@ -103,80 +103,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -192,7 +194,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -200,225 +202,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -717,6 +531,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -813,35 +632,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -850,14 +669,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -866,42 +685,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1099,6 +918,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/lt.po b/lt.po
index 2a4f8372d..1e05fdcb4 100644
--- a/lt.po
+++ b/lt.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 18:31+0000\n"
-"Last-Translator: Moo\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Lithuanian (http://www.transifex.com/otf/torproject/language/lt/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -98,80 +98,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "Atsisakyti"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Atsisakyti"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -179,7 +181,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -187,7 +189,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -195,225 +197,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Patvirtinkite"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -712,6 +526,11 @@ msgstr "Nusistatykite slaptažodį ekrano atrakinimui."
msgid "Password"
msgstr "Slaptažodis"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Patvirtinkite"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Šioje Tails versijoje yra žinomos saugumo problemos:"
@@ -808,35 +627,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -845,14 +664,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr "{volume_name} – {path_to_file_container}"
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -861,42 +680,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr "{volume_name} – {drive_name}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr "Neteisinga slaptafrazė arba parametrai"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr "Klaida atrakinant tomą"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1094,6 +913,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/lv.po b/lv.po
index 211278d63..f38c86d30 100644
--- a/lv.po
+++ b/lv.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Latvian (http://www.transifex.com/otf/torproject/language/lv/)\n"
"MIME-Version: 1.0\n"
@@ -97,80 +97,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -178,7 +180,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -194,225 +196,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -711,6 +525,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -807,35 +626,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -844,14 +663,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -860,42 +679,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1093,6 +912,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/mk.po b/mk.po
index 44ee23925..64121d2f3 100644
--- a/mk.po
+++ b/mk.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Macedonian (http://www.transifex.com/otf/torproject/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -96,80 +96,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -177,7 +179,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -185,7 +187,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -193,225 +195,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -710,6 +524,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -806,35 +625,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -843,14 +662,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -859,42 +678,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1092,6 +911,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/ml.po b/ml.po
index e012d8b5a..56952b9c6 100644
--- a/ml.po
+++ b/ml.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Malayalam (http://www.transifex.com/otf/torproject/language/ml/)\n"
"MIME-Version: 1.0\n"
@@ -97,80 +97,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -178,7 +180,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -194,225 +196,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -711,6 +525,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -807,35 +626,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -844,14 +663,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -860,42 +679,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1093,6 +912,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/mr.po b/mr.po
index d03ea7c84..8eda8ac72 100644
--- a/mr.po
+++ b/mr.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Marathi (http://www.transifex.com/otf/torproject/language/mr/)\n"
"MIME-Version: 1.0\n"
@@ -97,80 +97,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -178,7 +180,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -194,225 +196,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -711,6 +525,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -807,35 +626,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -844,14 +663,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -860,42 +679,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1093,6 +912,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/ms_MY.po b/ms_MY.po
index 8398a2180..c7a0ed2cb 100644
--- a/ms_MY.po
+++ b/ms_MY.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/otf/torproject/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -99,80 +99,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -180,7 +182,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -188,7 +190,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -196,225 +198,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -713,6 +527,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -809,35 +628,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -846,14 +665,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -862,42 +681,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1095,6 +914,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/my.po b/my.po
index 154f5bc81..e9e9e0f92 100644
--- a/my.po
+++ b/my.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Burmese (http://www.transifex.com/otf/torproject/language/my/)\n"
"MIME-Version: 1.0\n"
@@ -95,80 +95,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -709,6 +523,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1091,6 +910,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/nb.po b/nb.po
index f7803889f..b2e11f212 100644
--- a/nb.po
+++ b/nb.po
@@ -20,8 +20,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Norwegian Bokmål (http://www.transifex.com/otf/torproject/language/nb/)\n"
"MIME-Version: 1.0\n"
@@ -108,80 +108,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -189,7 +191,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -197,7 +199,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -205,225 +207,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -722,6 +536,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -818,35 +637,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -855,14 +674,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -871,42 +690,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1104,6 +923,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/ne.po b/ne.po
index 9d072a9d3..34f554c1b 100644
--- a/ne.po
+++ b/ne.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Nepali (http://www.transifex.com/otf/torproject/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -95,80 +95,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -709,6 +523,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1091,6 +910,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/nl.po b/nl.po
index 11cedc542..22e32e03e 100644
--- a/nl.po
+++ b/nl.po
@@ -34,9 +34,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 18:59+0000\n"
-"Last-Translator: Meteor 0id\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
+"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -122,80 +122,82 @@ msgstr "_Starten"
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "Annuleren"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Annuleren"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Offline"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -203,7 +205,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -211,7 +213,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -219,225 +221,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -736,6 +550,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -832,35 +651,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -869,14 +688,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -885,42 +704,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1118,6 +937,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/nl_BE.po b/nl_BE.po
index cfe64575d..b40a287fb 100644
--- a/nl_BE.po
+++ b/nl_BE.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Dutch (Belgium) (http://www.transifex.com/otf/torproject/language/nl_BE/)\n"
"MIME-Version: 1.0\n"
@@ -97,80 +97,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -178,7 +180,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -194,225 +196,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -711,6 +525,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -807,35 +626,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -844,14 +663,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -860,42 +679,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1093,6 +912,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/nn.po b/nn.po
index eecbdd856..60d62db74 100644
--- a/nn.po
+++ b/nn.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Norwegian Nynorsk (http://www.transifex.com/otf/torproject/language/nn/)\n"
"MIME-Version: 1.0\n"
@@ -97,80 +97,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -178,7 +180,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -194,225 +196,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -711,6 +525,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -807,35 +626,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -844,14 +663,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -860,42 +679,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1093,6 +912,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/oc.po b/oc.po
index 9215a66db..793c797c1 100644
--- a/oc.po
+++ b/oc.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/otf/torproject/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -95,80 +95,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -709,6 +523,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1091,6 +910,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/or.po b/or.po
index 420ed7562..37b74281b 100644
--- a/or.po
+++ b/or.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Oriya (http://www.transifex.com/otf/torproject/language/or/)\n"
"MIME-Version: 1.0\n"
@@ -95,80 +95,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -709,6 +523,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1091,6 +910,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/pa.po b/pa.po
index 295ef8948..3ca862ac7 100644
--- a/pa.po
+++ b/pa.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/otf/torproject/language/pa/)\n"
"MIME-Version: 1.0\n"
@@ -96,80 +96,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -177,7 +179,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -185,7 +187,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -193,225 +195,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -710,6 +524,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -806,35 +625,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -843,14 +662,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -859,42 +678,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1092,6 +911,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/pl.po b/pl.po
index fc86bf447..33d500c80 100644
--- a/pl.po
+++ b/pl.po
@@ -24,8 +24,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Polish (http://www.transifex.com/otf/torproject/language/pl/)\n"
"MIME-Version: 1.0\n"
@@ -112,80 +112,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -193,7 +195,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -201,7 +203,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -209,225 +211,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -726,6 +540,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -822,35 +641,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -859,14 +678,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -875,42 +694,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1108,6 +927,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/pt_BR.po b/pt_BR.po
index 4999ee8a0..1e071224b 100644
--- a/pt_BR.po
+++ b/pt_BR.po
@@ -32,8 +32,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
@@ -120,80 +120,82 @@ msgstr "_Lançar"
msgid "_Exit"
msgstr "_Saída"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Ponte & Proxy"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Offline"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "Desbloquear"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Falha ao rebloquear o volume de armazenamento persistente."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "Desbloqueando..."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "Não foi possível abrir o dispositivo de armazenamento criptografado com esta frase secreta"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "Configurações Adicionais"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "Cancelar"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "Anterior"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "_Senha de Administração"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Ponte & Proxy"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Offline"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Encerrar"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -201,7 +203,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -209,7 +211,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -217,225 +219,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "Senha de Administração"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "Crie uma senha de administração caso você precise realizar tarefas administrativas.\nCaso contrário, para garantir uma maior segurança, essa função será desabilitada ."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Inserir uma senha de administração"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Confirmar"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Confirmar a sua senha de administração"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Desabilitar"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Camuflagem Windows"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "Esta opção faz com que o Tails fique parecido com o Microsoft Windows 10, o que pode ser útil para evitar suspeitas em lugares públicos. "
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "Camuflagem Microsoft Windows 10"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "_Mascaragem de endereços MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "A Mascaragem de endereços MAC ocultará da rede local o número de série da sua interface de rede (Wi-Fi ou cabo). Mascarar endereços MAC é em geral mais seguro, porque permite ocultar a sua localização geográfica. Porém, essa opção pode gerar problemas de conexão ou parecer suspeita."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Mascarar todos os endereços MAC (padrão)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "Não mascarar endereços MAC"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "Você irá configurar uma ponte Tor e um proxy local após conectar-se a uma rede."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Boas-vindas ao Tails!"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "Se você desejar um guia das configurações do Tails, clique em <b>Guia</b>, acima"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "Desbloquear"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Idioma & Região"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Falha ao rebloquear o volume de armazenamento persistente."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Configurações-Padrão"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "Desbloqueando..."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Salvar Configurações de Idioma & Região"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "Não foi possível abrir o dispositivo de armazenamento criptografado com esta frase secreta"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "_Idioma"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "_Modelo de Teclado"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "_Formatos"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Zona Horária"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Criptografado_ Armazenamento Persistente"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Mostrar Frase secreta"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Configurar o Dispositivo de Armazenamento Persistente"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "Inserir a sua frase secreta para abrir o dispositivo de armazenamento persistente"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Rebloquear o Dispositivo de Armazenamento Persistente"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "O seu volume de armazenamento persistente está aberto. Reiniciar Tails para bloqueá-lo novamente."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_Configurações Adicionais"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Salvar Configurações Adicionais"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Adicionar uma configuração adicional"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "Configuração de Rede"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "Se a sua conexão de Internet estiver censurada, filtrada ou sob proxy, você pode configurar uma ponte Tor ou um proxy local. Para trabalhar totalmente offline, é preciso desabilitar toda conexão de rede."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Conectar-se diretamente à rede Tor (padrão)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Configurar uma ponte Tor ou um proxy local"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Desativar toda conexão de rede"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr "As configurações padrão são seguras na maioria dos casos. Para outras configurações personalizadas, clique na tecla \"+\" abaixo."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Senha de Administração"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -734,6 +548,11 @@ msgstr ""
msgid "Password"
msgstr "Senha"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Confirmar"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Esta versão do Tails tem problemas de segurança conhecidos:"
@@ -830,35 +649,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -867,14 +686,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -883,42 +702,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1116,6 +935,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "Senha de Administração"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "Crie uma senha de administração caso você precise realizar tarefas administrativas.\nCaso contrário, para garantir uma maior segurança, essa função será desabilitada ."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Inserir uma senha de administração"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Confirmar a sua senha de administração"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Desabilitar"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "_Mascaragem de endereços MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "A Mascaragem de endereços MAC ocultará da rede local o número de série da sua interface de rede (Wi-Fi ou cabo). Mascarar endereços MAC é em geral mais seguro, porque permite ocultar a sua localização geográfica. Porém, essa opção pode gerar problemas de conexão ou parecer suspeita."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Mascarar todos os endereços MAC (padrão)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "Não mascarar endereços MAC"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Configuração de Rede"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "Se a sua conexão de Internet estiver censurada, filtrada ou sob proxy, você pode configurar uma ponte Tor ou um proxy local. Para trabalhar totalmente offline, é preciso desabilitar toda conexão de rede."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Conectar-se diretamente à rede Tor (padrão)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Configurar uma ponte Tor ou um proxy local"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Desativar toda conexão de rede"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "Você irá configurar uma ponte Tor e um proxy local após conectar-se a uma rede."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Boas-vindas ao Tails!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Idioma & Região"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Configurações-Padrão"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Criptografado_ Armazenamento Persistente"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Configurar o Dispositivo de Armazenamento Persistente"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "Inserir a sua frase secreta para abrir o dispositivo de armazenamento persistente"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Rebloquear o Dispositivo de Armazenamento Persistente"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "O seu volume de armazenamento persistente está aberto. Reiniciar Tails para bloqueá-lo novamente."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_Configurações Adicionais"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Adicionar uma configuração adicional"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "As configurações padrão são seguras na maioria dos casos. Para outras configurações personalizadas, clique na tecla \"+\" abaixo."
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/pt_PT.po b/pt_PT.po
index 32d000e7b..0ff0fbaee 100644
--- a/pt_PT.po
+++ b/pt_PT.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/otf/torproject/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
@@ -100,80 +100,82 @@ msgstr "_Iniciar"
msgid "_Exit"
msgstr "_Sair"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Cancelar"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -181,7 +183,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -189,7 +191,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -197,225 +199,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -714,6 +528,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Esta versão do Tails tem alguns problemas de segurança conhecidos:"
@@ -810,35 +629,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -847,14 +666,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -863,42 +682,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1096,6 +915,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/ro.po b/ro.po
index d7f7f13b7..7827fd562 100644
--- a/ro.po
+++ b/ro.po
@@ -25,8 +25,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Romanian (http://www.transifex.com/otf/torproject/language/ro/)\n"
"MIME-Version: 1.0\n"
@@ -113,80 +113,82 @@ msgstr "_Lansare"
msgid "_Exit"
msgstr "_Iesire"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "Anulare"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Anulare"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -194,7 +196,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -202,7 +204,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -210,225 +212,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Confirmă"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -727,6 +541,11 @@ msgstr "Setați o parolă pentru a debloca ecranul."
msgid "Password"
msgstr "Parola"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Confirmă"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Această versiune Tails are probleme de securitate cunoscute:"
@@ -823,35 +642,35 @@ msgstr "Circuite Onion Deschise"
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr "{volume_label} ({volume_size})"
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr "{partition_name} ({partition_size})"
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr "{volume_size} Volum"
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr "{volume_name} (Read-Only)"
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr "{partition_name} în {container_path}"
@@ -860,14 +679,14 @@ msgstr "{partition_name} în {container_path}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr "{volume_name} – {path_to_file_container}"
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr "{partition_name} pe {drive_name}"
@@ -876,42 +695,42 @@ msgstr "{partition_name} pe {drive_name}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr "{volume_name} – {drive_name}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr "Frază de access sau parametri greșiti"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr "Eroare la deblocarea volumului"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr "Nu s-a putut debloca volumul {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1109,6 +928,130 @@ msgid ""
" ($(command_line))"
msgstr "Aveți nevoie de autentificare pentru a elimina un pachet din aplicațiile adiționale ($(command_line))"
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr "Containere de Fișiere"
diff --git a/ru.po b/ru.po
index bed306393..ae6b90fb0 100644
--- a/ru.po
+++ b/ru.po
@@ -37,8 +37,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -125,80 +125,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -206,7 +208,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -214,7 +216,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -222,225 +224,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -739,6 +553,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -835,35 +654,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -872,14 +691,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -888,42 +707,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1121,6 +940,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/si_LK.po b/si_LK.po
index 7c690fb77..db4c63284 100644
--- a/si_LK.po
+++ b/si_LK.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/otf/torproject/language/si_LK/)\n"
"MIME-Version: 1.0\n"
@@ -95,80 +95,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -709,6 +523,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1091,6 +910,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/sk.po b/sk.po
index 7bba08f83..922a4ad18 100644
--- a/sk.po
+++ b/sk.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Slovak (http://www.transifex.com/otf/torproject/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -103,80 +103,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -192,7 +194,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -200,225 +202,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -717,6 +531,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -813,35 +632,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -850,14 +669,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -866,42 +685,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1099,6 +918,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/sl.po b/sl.po
index 050b3ca39..30829caef 100644
--- a/sl.po
+++ b/sl.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Slovenian (http://www.transifex.com/otf/torproject/language/sl/)\n"
"MIME-Version: 1.0\n"
@@ -96,80 +96,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -177,7 +179,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -185,7 +187,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -193,225 +195,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -710,6 +524,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -806,35 +625,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -843,14 +662,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -859,42 +678,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1092,6 +911,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/son.po b/son.po
index cff489f94..6bcad58b4 100644
--- a/son.po
+++ b/son.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Songhay (http://www.transifex.com/otf/torproject/language/son/)\n"
"MIME-Version: 1.0\n"
@@ -95,80 +95,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -709,6 +523,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1091,6 +910,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/sq.po b/sq.po
index 2b33065c2..0eceb4659 100644
--- a/sq.po
+++ b/sq.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Albanian (http://www.transifex.com/otf/torproject/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -97,80 +97,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -178,7 +180,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -194,225 +196,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -711,6 +525,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -807,35 +626,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -844,14 +663,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -860,42 +679,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1093,6 +912,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/sr.po b/sr.po
index 8a3b66e8f..0a94974b4 100644
--- a/sr.po
+++ b/sr.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Serbian (http://www.transifex.com/otf/torproject/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -99,80 +99,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -180,7 +182,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -188,7 +190,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -196,225 +198,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -713,6 +527,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -809,35 +628,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -846,14 +665,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -862,42 +681,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1095,6 +914,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/sv.po b/sv.po
index 2ecb7d901..26d8359bf 100644
--- a/sv.po
+++ b/sv.po
@@ -24,8 +24,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -112,80 +112,82 @@ msgstr "_Starta"
msgid "_Exit"
msgstr "_Avsluta"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
-msgstr "Avbryt"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -193,7 +195,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -201,7 +203,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -209,225 +211,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Bekräfta"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -726,6 +540,11 @@ msgstr "Ställ in ett lösenord för att låsa upp skärmen."
msgid "Password"
msgstr "Lösenord"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Bekräfta"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Det finns kända säkerhetsproblem i den här Tails versionen:"
@@ -822,35 +641,35 @@ msgstr "Öppna Onion-kretsar"
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr "{volume_label} ({volume_size})"
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr "{partition_name} ({partition_size})"
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr "{volume_size} Volym"
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr "{volume_name} (Skrivskyddad)"
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr "{partition_name} i {container_path}"
@@ -859,14 +678,14 @@ msgstr "{partition_name} i {container_path}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr "{volume_name} – {path_to_file_container}"
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr "{partition_name} på {drive_name}"
@@ -875,42 +694,42 @@ msgstr "{partition_name} på {drive_name}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr "{volume_name} – {drive_name}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr "Fel lösenfras eller parametrar"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr "Ett fel uppstod vid upplåsning av volymen"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr "Kunde inte låsa upp volymen {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1108,6 +927,130 @@ msgid ""
" ($(command_line))"
msgstr "Autentisering krävs för att ta bort ett paket från dina extra program ($(command_line))"
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr "Filbehållare"
diff --git a/sw.po b/sw.po
index 3dc370078..e4945cdcd 100644
--- a/sw.po
+++ b/sw.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Swahili (http://www.transifex.com/otf/torproject/language/sw/)\n"
"MIME-Version: 1.0\n"
@@ -95,80 +95,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -709,6 +523,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1091,6 +910,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/ta.po b/ta.po
index 07c0c4b9c..2eba20591 100644
--- a/ta.po
+++ b/ta.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Tamil (http://www.transifex.com/otf/torproject/language/ta/)\n"
"MIME-Version: 1.0\n"
@@ -97,80 +97,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -178,7 +180,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -194,225 +196,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -711,6 +525,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -807,35 +626,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -844,14 +663,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -860,42 +679,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1093,6 +912,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/tails.pot b/tails.pot
index c08782e3c..ae43b4b32 100644
--- a/tails.pot
+++ b/tails.pot
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: English (http://www.transifex.com/otf/torproject/language/en/)\n"
"MIME-Version: 1.0\n"
@@ -95,80 +95,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -709,6 +523,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1091,6 +910,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/te.po b/te.po
index ff58a0918..16c12f301 100644
--- a/te.po
+++ b/te.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Telugu (http://www.transifex.com/otf/torproject/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -95,80 +95,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -709,6 +523,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1091,6 +910,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/th.po b/th.po
index ae45ef86e..afa92a77b 100644
--- a/th.po
+++ b/th.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Thai (http://www.transifex.com/otf/torproject/language/th/)\n"
"MIME-Version: 1.0\n"
@@ -100,80 +100,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -181,7 +183,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -189,7 +191,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -197,225 +199,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -714,6 +528,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -810,35 +629,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -847,14 +666,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -863,42 +682,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1096,6 +915,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/tr.po b/tr.po
index 8389444d5..1f39550f3 100644
--- a/tr.po
+++ b/tr.po
@@ -29,8 +29,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n"
"MIME-Version: 1.0\n"
@@ -117,80 +117,82 @@ msgstr "_Başlat"
msgid "_Exit"
msgstr "Çı_kış"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
-msgstr "Doğrudan (varsayılan)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "Köprü ve Vekil Sunucu"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "Çevrimdışı"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "Kilidi Aç"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "Kalıcı depolama yeniden kilitlenemedi."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "Kilit açılıyor..."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "Bu parola ile şifreli depolama alanının kilidi açılamadı."
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "Ek Ayarlar"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "İptal"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "Ekle"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "Geri"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "_Yönetim Parolası"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "_MAC Adresi Yanıltması"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "_Ağ Bağlantısı"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "Doğrudan (varsayılan)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "Köprü ve Vekil Sunucu"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "Çevrimdışı"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "Açık (varsayılan)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "Açık"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "Kapalı"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "Kapalı (varsayılan)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "Kapat"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr "_Tails Başlat"
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "default:LTR"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr "live-persist şu hata kodu ile yürütülemedi {returncode}:\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -198,7 +200,7 @@ msgid ""
"{stderr}"
msgstr "cryptsetup şu hata kodu ile yürütülemedi {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -206,7 +208,7 @@ msgid ""
"{stderr}"
msgstr "live-persist şu hata kodu ile yürütülemedi {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -214,225 +216,37 @@ msgid ""
"{stderr}"
msgstr "umount şu hata kodu ile yürütülemedi {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "Yönetici Parolası"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "Yönetim işlemleri yapacaksanız bir yönetim parolası yazın. Yoksa güvenlik için yönetim parolası devre dışı bırakılır."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "Yönetim parolasını yazın"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "Onayla"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "Yönetim parolasını onaylayın"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "Devre Dışı Bırak"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Windows Gizlenmesi"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "Bu seçenek Tails görünümünün Microsoft Windows 10 gibi görünmesini sağlar. Bu özellik, herkese açık yerlerde şüpheli görünmekten kaçınmak için kullanışlı olabilir."
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "Microsoft Windows 10 Gizlenmesi"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "MAC Adresi Yanıltması"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "MAC adreslerini yanıltması ağ kartlarınızın (Wi-Fİ ya da kablolu) seri numarasını yerel ağlardan gizler. Bu özellik coğrafi konumunuzu gizlemenize yardımcı olacağından genellikle daha fazla güvenlik sağlar. Bununla birlikte bağlanma sorunlarına ya da şüpheli olarak algılanmanıza yol açabilir."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "Tüm MAC adresleri yanıltılsın (varsayılan)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "MAC adresleri yanıltılmasın"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "Bir ağa bağlandıktan sonra Tor köprüsü ya da yerel vekil sunucu yapılandırmasını yapacaksınız."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "Tails Uygulamasına Hoş Geldiniz!"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "Tails ayarlarını yapmak için yukarıdan <b>Tura Katılın</b>"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "Kilidi Aç"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "Dil ve Bölge"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "Kalıcı depolama yeniden kilitlenemedi."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "Varsayılan Ayarlar"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "Kilit açılıyor..."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "Dil ve Bölge Ayarlarını Kaydet"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "Bu parola ile şifreli depolama alanının kilidi açılamadı."
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "_Dil"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "_Tuş Takımı Düzeni"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "_Biçimler"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "_Saat Dilimi"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "Şifreli _Kalıcı Depolama"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "Parola Görüntülensin"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "Kalıcı Depolama Yapılandırması"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "Kalıcı depolamanın kilidini açmak için parolanızı yazın"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "Kalıcı Depolamayı Yeniden Kilitle"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "Kalıcı depolama alanının kilidi açıldı. Yeniden kilitlemek için Tails uygulamasını yeniden başlatın."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "_Ek Ayarlar"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "Ek Ayarları Kaydet"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "Ek bir ayar ekle"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "Ağ Yapılandırması"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "İnternet bağlantınız sansürleniyor, süzülüyor ya da vekil sunucu kullanıyorsa, bir Tor köprüsü ya da yerel vekil sunucu yapılandırabilirsiniz. Tamamıyla çevrimdışı çalışmak için, tüm ağları devre dışı bırakabilirsiniz."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "Doğrudan Tor ağına bağlanılsın (varsayılan)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "Bir Tor köprüsü ya da vekil sunucu yapılandır"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "Tüm ağ devre dışı bırakılsın"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr "Çoğu durum için varsayılan ayarları kullanmak güvenlidir. Özel bir ayar eklemek için aşağıdaki \"+\" düğmesine tıklayın."
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "_Yönetim Parolası"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "Kapalı (varsayılan)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "_MAC Adresi Yanıltması"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "Açık (varsayılan)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "_Ağ Bağlantısı"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "_Windows Gizlenmesi"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "Açık"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "Kapalı"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -731,6 +545,11 @@ msgstr "Ekran kilidini açmak için bir parola ayarlayın."
msgid "Password"
msgstr "Parola"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "Onayla"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "Bu Tails sürümünde bilinen bazı güvenlik sorunları var: "
@@ -827,35 +646,35 @@ msgstr "Açık Onion Devreleri"
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr "{volume_label} ({volume_size})"
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr "{partition_name} ({partition_size})"
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr "{volume_size} Birim"
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr "{volume_name} (Salt Okunur)"
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr "{container_path} içindeki {partition_name}"
@@ -864,14 +683,14 @@ msgstr "{container_path} içindeki {partition_name}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr "{volume_name} – {path_to_file_container}"
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr "{drive_name} üzerindeki {partition_name}"
@@ -880,42 +699,42 @@ msgstr "{drive_name} üzerindeki {partition_name}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr "{volume_name} – {drive_name}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr "Parola ya da parametreler hatalı"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr "Birim kilidi açılırken sorun çıktı"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr "{volume_name} biriminin kilidi açılamadı:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr "Bir ya da birkaç uygulama bu birimi meşgul ediyor."
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr "Birim kilitlenemedi {volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr "Birim kilitlenemedi"
@@ -1113,6 +932,130 @@ msgid ""
" ($(command_line))"
msgstr "Ek yazılımlarınızdan bir paket kaldırmak için kimlik doğrulaması gerekir ($(command_line))"
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "Yönetici Parolası"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "Yönetim işlemleri yapacaksanız bir yönetim parolası yazın. Yoksa güvenlik için yönetim parolası devre dışı bırakılır."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "Yönetim parolasını yazın"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "Yönetim parolasını onaylayın"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "Devre Dışı Bırak"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "MAC Adresi Yanıltması"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "MAC adreslerini yanıltması ağ kartlarınızın (Wi-Fİ ya da kablolu) seri numarasını yerel ağlardan gizler. Bu özellik coğrafi konumunuzu gizlemenize yardımcı olacağından genellikle daha fazla güvenlik sağlar. Bununla birlikte bağlanma sorunlarına ya da şüpheli olarak algılanmanıza yol açabilir."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "Tüm MAC adresleri yanıltılsın (varsayılan)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "MAC adresleri yanıltılmasın"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "Ağ Yapılandırması"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "İnternet bağlantınız sansürleniyor, süzülüyor ya da vekil sunucu kullanıyorsa, bir Tor köprüsü ya da yerel vekil sunucu yapılandırabilirsiniz. Tamamıyla çevrimdışı çalışmak için, tüm ağları devre dışı bırakabilirsiniz."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "Doğrudan Tor ağına bağlanılsın (varsayılan)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "Bir Tor köprüsü ya da vekil sunucu yapılandır"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "Tüm ağ devre dışı bırakılsın"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "Bir ağa bağlandıktan sonra Tor köprüsü ya da yerel vekil sunucu yapılandırmasını yapacaksınız."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "Tails Uygulamasına Hoş Geldiniz!"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "Dil ve Bölge"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "Varsayılan Ayarlar"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "Şifreli _Kalıcı Depolama"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "Kalıcı Depolama Yapılandırması"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "Kalıcı depolamanın kilidini açmak için parolanızı yazın"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "Kalıcı Depolamayı Yeniden Kilitle"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "Kalıcı depolama alanının kilidi açıldı. Yeniden kilitlemek için Tails uygulamasını yeniden başlatın."
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "_Ek Ayarlar"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "Ek bir ayar ekle"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "Çoğu durum için varsayılan ayarları kullanmak güvenlidir. Özel bir ayar eklemek için aşağıdaki \"+\" düğmesine tıklayın."
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr "Dosya Kapsayıcıları"
diff --git a/uk.po b/uk.po
index 2d129f6dc..064612f76 100644
--- a/uk.po
+++ b/uk.po
@@ -18,8 +18,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Ukrainian (http://www.transifex.com/otf/torproject/language/uk/)\n"
"MIME-Version: 1.0\n"
@@ -106,80 +106,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -187,7 +189,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -195,7 +197,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -203,225 +205,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -720,6 +534,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -816,35 +635,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -853,14 +672,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -869,42 +688,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1102,6 +921,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/ur.po b/ur.po
index 4ed76aa2b..61680baa5 100644
--- a/ur.po
+++ b/ur.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Urdu (http://www.transifex.com/otf/torproject/language/ur/)\n"
"MIME-Version: 1.0\n"
@@ -96,80 +96,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -177,7 +179,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -185,7 +187,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -193,225 +195,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -710,6 +524,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -806,35 +625,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -843,14 +662,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -859,42 +678,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1092,6 +911,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/uz.po b/uz.po
index 677efcacf..79a3bcf29 100644
--- a/uz.po
+++ b/uz.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Uzbek (http://www.transifex.com/otf/torproject/language/uz/)\n"
"MIME-Version: 1.0\n"
@@ -95,80 +95,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -176,7 +178,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -184,7 +186,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -192,225 +194,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -709,6 +523,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -805,35 +624,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -842,14 +661,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -858,42 +677,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1091,6 +910,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/vi.po b/vi.po
index a7f555206..204f3aa18 100644
--- a/vi.po
+++ b/vi.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Vietnamese (http://www.transifex.com/otf/torproject/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -97,80 +97,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -178,7 +180,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -186,7 +188,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -194,225 +196,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -711,6 +525,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -807,35 +626,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -844,14 +663,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -860,42 +679,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1093,6 +912,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/zh_CN.po b/zh_CN.po
index 17b07fbff..810b964c4 100644
--- a/zh_CN.po
+++ b/zh_CN.po
@@ -31,8 +31,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -119,80 +119,82 @@ msgstr "启动(_L)"
msgid "_Exit"
msgstr "退出(_E)"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
-msgstr "直接（默认）"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
-msgstr "网桥和代理"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
-msgstr "脱机"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
-msgstr "解锁"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
-msgstr "重新锁定持久存储失败。"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
-msgstr "正在解锁…"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
-msgstr "无法用此密码解锁加密的存储。"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
msgid "Additional Settings"
msgstr "额外设置"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
#: config/chroot_local-includes/usr/local/bin/tor-browser:46
msgid "Cancel"
msgstr "取消"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
msgid "Add"
msgstr "添加"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
msgid "Back"
msgstr "后退"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
+msgstr "管理员密码(_A)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
+msgstr "MAC 地址欺骗(_M)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
+msgstr "网络连接(_N)"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
+msgstr "直接（默认）"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
+msgstr "网桥和代理"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
+msgstr "脱机"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
+msgstr "开启（默认）"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
+msgstr "开"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr "关"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
+msgstr "关闭（默认）"
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
msgid "Shutdown"
msgstr "关闭"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
msgid "_Start Tails"
msgstr "启动 Tails(_S)"
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
-msgstr "default:LTR"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr "启动持久存储失败，返回代码 {returncode}:\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -200,7 +202,7 @@ msgid ""
"{stderr}"
msgstr "加密设置失败，返回代码 {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -208,7 +210,7 @@ msgid ""
"{stderr}"
msgstr "启动持久存储失败，返回代码 {returncode}：\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -216,225 +218,37 @@ msgid ""
"{stderr}"
msgstr "挂载失败，返回代码 {returncode}:\n{stdout}\n{stderr}"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr "管理密码"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr "如果您需要执行管理任务，请设置一个管理密码。否则，禁用管理密码以取得更高安全性。"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr "请输入管理密码"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr "确认"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr "确认您的管理密码"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr "禁用"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr "Windows 伪装"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr "此选项将使 Tails 看起来像是 Microsoft Windows 10。这有助于避免在公共场所引起注意。"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr "Microsoft Windows 10 伪装"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr "MAC 地址欺骗"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr "MAC 地址欺骗向本地网络隐藏您的网络接口（Wi-Fi 或有线网络）的序列号。欺骗 MAC 地址通常更安全，有助于您隐藏您的地理位置。但它也可能造成连接问题或看起来可疑。"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr "欺骗所有 MAC 地址（默认）"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr "不欺骗任何 MAC 地址"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr "您将在稍后连接到网络后配置 Tor 网桥和本地代理设置。"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr "欢迎使用 Tails！"
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
-msgstr "要获取 Tails 设置的指南，点击上面的<b>导览</b>"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
+msgstr "解锁"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
-msgstr "语言和区域"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
+msgstr "重新锁定持久存储失败。"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
-msgstr "默认设置"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
+msgstr "正在解锁…"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
-msgstr "保存语言和区域设置"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
+msgstr "无法用此密码解锁加密的存储。"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr "语言(_L)"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr "键盘布局(_K)"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr "格式(_F)"
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr "时区(_T)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr "加密的持久存储(_P)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr "显示密码"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr "配置持久存储"
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr "请输入您的密码以解锁持久存储"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr "重新锁定持久存储"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr "您的持久存储已解锁。重启 Tails 以再次锁定它。"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr "附加设置(_A)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr "保存额外设置"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr "添加一个额外设置"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr "网络配置"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr "如果您的互联网连接受到审查、过滤或者通过代理服务器，您可以配置一个 Tor 网桥或本地代理。要完全脱机工作，您可以禁用所有网络。"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr "直接连接 Tor 网络（默认）"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr "配置 Tor 网桥或本地代理"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr "禁用所有网络"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr "默认设置在大多数情况下是安全的。要添加自定义设置，点击下面的 + 按钮。"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr "管理员密码(_A)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr "关闭（默认）"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr "MAC 地址欺骗(_M)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr "开启（默认）"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr "网络连接(_N)"
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr "伪装 Windows(_W)"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr "开"
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr "关"
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -733,6 +547,11 @@ msgstr "设定解锁屏幕的密码"
msgid "Password"
msgstr "密码"
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr "确认"
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr "该版本 Tails 的已知安全问题："
@@ -829,35 +648,35 @@ msgstr "打开 Onion 链路"
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr "{volume_label} ({volume_size})"
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr "{partition_name} ({partition_size})"
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr "{volume_size} 卷"
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr "{volume_name} (只读)"
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr "{container_path} 中的 {partition_name}"
@@ -866,14 +685,14 @@ msgstr "{container_path} 中的 {partition_name}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr "{path_to_file_container} - {volume_name}"
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr "{drive_name} 上的 {partition_name}"
@@ -882,42 +701,42 @@ msgstr "{drive_name} 上的 {partition_name}"
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr "{drive_name} - {volume_name}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr "口令或参数错误"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr "解锁加密卷出错"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr "无法解锁加密卷{volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr "一个或更多应用致使卷正忙。"
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr "无法锁定卷{volume_name}:\n{error_message}"
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr "锁定卷失败"
@@ -1115,6 +934,130 @@ msgid ""
" ($(command_line))"
msgstr "移除附加软件需要认证 ($(command_line))"
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr "管理密码"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr "如果您需要执行管理任务，请设置一个管理密码。否则，禁用管理密码以取得更高安全性。"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr "请输入管理密码"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr "确认您的管理密码"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr "禁用"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr "MAC 地址欺骗"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr "MAC 地址欺骗向本地网络隐藏您的网络接口（Wi-Fi 或有线网络）的序列号。欺骗 MAC 地址通常更安全，有助于您隐藏您的地理位置。但它也可能造成连接问题或看起来可疑。"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr "欺骗所有 MAC 地址（默认）"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr "不欺骗任何 MAC 地址"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr "网络配置"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr "如果您的互联网连接受到审查、过滤或者通过代理服务器，您可以配置一个 Tor 网桥或本地代理。要完全脱机工作，您可以禁用所有网络。"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr "直接连接 Tor 网络（默认）"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr "配置 Tor 网桥或本地代理"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr "禁用所有网络"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr "您将在稍后连接到网络后配置 Tor 网桥和本地代理设置。"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr "欢迎使用 Tails！"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr "语言和区域"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr "默认设置"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr "加密的持久存储(_P)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr "配置持久存储"
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr "请输入您的密码以解锁持久存储"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr "重新锁定持久存储"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr "您的持久存储已解锁。重启 Tails 以再次锁定它。"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr "附加设置(_A)"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr "添加一个额外设置"
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr "默认设置在大多数情况下是安全的。要添加自定义设置，点击下面的 + 按钮。"
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr "文件容器"
diff --git a/zh_HK.po b/zh_HK.po
index ca04c280e..e52fb01de 100644
--- a/zh_HK.po
+++ b/zh_HK.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/otf/torproject/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -100,80 +100,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -181,7 +183,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -189,7 +191,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -197,225 +199,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -714,6 +528,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -810,35 +629,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -847,14 +666,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -863,42 +682,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1096,6 +915,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
diff --git a/zh_TW.po b/zh_TW.po
index 936f1e795..b17ca5220 100644
--- a/zh_TW.po
+++ b/zh_TW.po
@@ -20,8 +20,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-03 17:58+0200\n"
-"PO-Revision-Date: 2019-10-05 14:03+0000\n"
+"POT-Creation-Date: 2019-10-05 16:50+0200\n"
+"PO-Revision-Date: 2019-10-06 02:05+0000\n"
"Last-Translator: carolyn <carolyn at anhalt.org>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -108,80 +108,82 @@ msgstr ""
msgid "_Exit"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:386
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1687
-msgid "Direct (default)"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:32
+msgid "Additional Settings"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:392
-msgid "Bridge & Proxy"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:40
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
+#: config/chroot_local-includes/usr/local/bin/tor-browser:46
+msgid "Cancel"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:398
-msgid "Offline"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:46
+msgid "Add"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:479
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:529
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1080
-msgid "Unlock"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/add_settings_dialog.py:54
+msgid "Back"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:482
-msgid "Failed to relock persistent storage."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:56
+msgid "_Administration Password"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:500
-msgid "Unlocking…"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:156
+msgid "_MAC Address Spoofing"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:533
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:419
-msgid "Cannot unlock encrypted storage with this passphrase."
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:206
+msgid "_Network Connection"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:595
-msgid "Additional Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:215
+msgid "Direct (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:603
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:367
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119
-#: config/chroot_local-includes/usr/local/bin/tor-browser:46
-msgid "Cancel"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:217
+msgid "Bridge & Proxy"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:609
-msgid "Add"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:219
+msgid "Offline"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:617
-msgid "Back"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:270
+msgid "On (default)"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:731
-msgid "Shutdown"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:272
+msgid "On"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/gui.py:736
-msgid "_Start Tails"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:274
+msgid "Off"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:276
+msgid "Off (default)"
msgstr ""
-#. Translators: please do not translate this string (it is read from
-#. Gtk translation)
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/language.py:139
-msgid "default:LTR"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:172
+msgid "Shutdown"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:91
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/main_window.py:177
+msgid "_Start Tails"
+msgstr ""
+
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:92
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:124
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:141
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:125
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:142
#, python-brace-format
msgid ""
"cryptsetup failed with return code {returncode}:\n"
@@ -189,7 +191,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:158
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:160
#, python-brace-format
msgid ""
"live-persist failed with return code {returncode}:\n"
@@ -197,7 +199,7 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/persistence.py:172
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/settings/persistence.py:174
#, python-brace-format
msgid ""
"umount failed with return code {returncode}:\n"
@@ -205,225 +207,37 @@ msgid ""
"{stderr}"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:18
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:56
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1887
-msgid "Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:34
-msgid ""
-"Set up an administration password if you need to perform administrative "
-"tasks. Otherwise, the administration password is disabled for better "
-"security."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:69
-msgid "Enter an administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:95
-#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
-msgid "Confirm"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:109
-msgid "Confirm your administration password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:129
-msgid "Disable"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:160
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1899
-msgid "Windows Camouflage"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:176
-msgid ""
-"This option makes Tails look like Microsoft Windows 10. This can be useful "
-"to avoid attracting suspicion in public places."
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:198
-msgid "Microsoft Windows 10 camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:239
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1891
-msgid "MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:255
-msgid ""
-"MAC address spoofing hides the serial number of your network interface (Wi-"
-"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
-" as it helps you hide your geographical location. But it might also create "
-"connectivity problems or look suspicious."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:298
-msgid "Spoof all MAC addresses (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:344
-msgid "Don't spoof MAC addresses"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:479
-msgid ""
-"You will configure the Tor bridge and local proxy later on after connecting "
-"to a network."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:531
-msgid "Welcome to Tails!"
-msgstr ""
-
-#. This string will never be displayed in the 1st version of the greeter.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:546
-msgctxt ""
-"\"Take a Tour\" would be an assistant to guide the user through the "
-"available settings."
-msgid ""
-"To get guided through Tails' settings, click on <b>Take a Tour</b> above"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:60
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:107
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:425
+msgid "Unlock"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:581
-msgid "Language & Region"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:63
+msgid "Failed to relock persistent storage."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:617
-msgid "Default Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:79
+msgid "Unlocking…"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:630
-msgid "Save Language & Region Settings"
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/persistent_storage.py:111
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:40
+msgid "Cannot unlock encrypted storage with this passphrase."
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:691
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:135
msgid "_Language"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:748
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:153
msgid "_Keyboard Layout"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:806
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/region_settings.py:171
msgid "_Formats"
msgstr ""
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:863
-msgid "_Time Zone"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:924
-msgid "Encrypted _Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:965
-msgid "Show Passphrase"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1037
-msgid "Configure Persistent Storage"
-msgstr ""
-
-#. The label for this placeholder text is not very big, so keep this string
-#. short.
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1065
-msgid "Enter your passphrase to unlock the persistent storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1111
-msgid "Relock Persistent Storage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1126
-msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1164
-msgid "_Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1204
-msgid "Save Additional Settings"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1262
-msgid "Add an additional setting"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1317
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1895
-msgid "Network Configuration"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1333
-msgid ""
-"If your Internet connection is censored, filtered, or proxied you can "
-"configure a Tor bridge or a local proxy. To work completely offline, you can"
-" disable all networking."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1375
-msgid "Connect directly to the Tor network (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1421
-msgid "Configure a Tor bridge or local proxy"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1465
-msgid "Disable all networking"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1512
-msgid ""
-"The default settings are safe in most situations. To add a custom setting, "
-"press the \"+\" button below."
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1559
-msgid "_Administration Password"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1573
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1745
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:45
-msgid "Off (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1616
-msgid "_MAC Address Spoofing"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1630
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:43
-msgid "On (default)"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1673
-msgid "_Network Connection"
-msgstr ""
-
-#: config/chroot_local-includes/usr/share/tails-greeter/greeter.ui:1731
-msgid "_Windows Camouflage"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:48
-msgid "On"
-msgstr ""
-
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/utils.py:50
-msgid "Off"
-msgstr ""
-
#: config/chroot_local-includes/usr/local/bin/keepassxc:15
#, sh-format
msgid ""
@@ -722,6 +536,11 @@ msgstr ""
msgid "Password"
msgstr ""
+#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:150
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:93
+msgid "Confirm"
+msgstr ""
+
#: config/chroot_local-includes/usr/local/bin/tails-security-check:124
msgid "This version of Tails has known security issues:"
msgstr ""
@@ -818,35 +637,35 @@ msgstr ""
#. Translators: Don't translate {volume_label} or {volume_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:58
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64
#, python-brace-format
msgid "{volume_label} ({volume_size})"
msgstr ""
#. Translators: Don't translate {partition_name} or {partition_size},
#. they are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:63
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69
#, python-brace-format
msgid "{partition_name} ({partition_size})"
msgstr ""
#. Translators: Don't translate {volume_size}, it's a placeholder
#. and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:68
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74
#, python-brace-format
msgid "{volume_size} Volume"
msgstr ""
#. Translators: Don't translate {volume_name}, it's a placeholder and
#. will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:107
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113
#, python-brace-format
msgid "{volume_name} (Read-Only)"
msgstr ""
#. Translators: Don't translate {partition_name} and {container_path}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:115
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121
#, python-brace-format
msgid "{partition_name} in {container_path}"
msgstr ""
@@ -855,14 +674,14 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:122
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
#, python-brace-format
msgid "{volume_name} – {path_to_file_container}"
msgstr ""
#. Translators: Don't translate {partition_name} and {drive_name}, they
#. are placeholders and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134
#, python-brace-format
msgid "{partition_name} on {drive_name}"
msgstr ""
@@ -871,42 +690,42 @@ msgstr ""
#. they are placeholders and will be replaced. You should only have to
#. translate
#. this string if it makes sense to reverse the order of the placeholders.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:135
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141
#, python-brace-format
msgid "{volume_name} – {drive_name}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:222
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
msgid "Wrong passphrase or parameters"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:224
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:230
msgid "Error unlocking volume"
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:228
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234
#, python-brace-format
msgid ""
"Couldn't unlock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:330
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
msgid "One or more applications are keeping the volume busy."
msgstr ""
#. Translators: Don't translate {volume_name} or {error_message},
#. they are placeholder and will be replaced.
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:342
#, python-brace-format
msgid ""
"Couldn't lock volume {volume_name}:\n"
"{error_message}"
msgstr ""
-#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:338
+#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344
msgid "Locking the volume failed"
msgstr ""
@@ -1104,6 +923,130 @@ msgid ""
" ($(command_line))"
msgstr ""
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:18
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:56
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:669
+msgid "Administration Password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:34
+msgid ""
+"Set up an administration password if you need to perform administrative "
+"tasks. Otherwise, the administration password is disabled for better "
+"security."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:69
+msgid "Enter an administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:107
+msgid "Confirm your administration password"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124
+msgid "Disable"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:673
+msgid "MAC Address Spoofing"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:170
+msgid ""
+"MAC address spoofing hides the serial number of your network interface (Wi-"
+"Fi or wired) to the local network. Spoofing MAC addresses is generally safer"
+" as it helps you hide your geographical location. But it might also create "
+"connectivity problems or look suspicious."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:212
+msgid "Spoof all MAC addresses (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:258
+msgid "Don't spoof MAC addresses"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:311
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:677
+msgid "Network Configuration"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:327
+msgid ""
+"If your Internet connection is censored, filtered, or proxied you can "
+"configure a Tor bridge or a local proxy. To work completely offline, you can"
+" disable all networking."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:367
+msgid "Connect directly to the Tor network (default)"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:413
+msgid "Configure a Tor bridge or local proxy"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:457
+msgid "Disable all networking"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100
+msgid ""
+"You will configure the Tor bridge and local proxy later on after connecting "
+"to a network."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:152
+msgid "Welcome to Tails!"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:186
+msgid "Language & Region"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:222
+msgid "Default Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:285
+msgid "Encrypted _Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:382
+msgid "Configure Persistent Storage"
+msgstr ""
+
+#. The label for this placeholder text is not very big, so keep this string
+#. short.
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:410
+msgid "Enter your passphrase to unlock the persistent storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:456
+msgid "Relock Persistent Storage"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:471
+msgid "Your persistent storage is unlocked. Restart Tails to lock it again."
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:509
+msgid "_Additional Settings"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:592
+msgid "Add an additional setting"
+msgstr ""
+
+#: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:641
+msgid ""
+"The default settings are safe in most situations. To add a custom setting, "
+"press the \"+\" button below."
+msgstr ""
+
#: ../config/chroot_local-includes/usr/share/tails/unlock-veracrypt-volumes/main.ui.in:61
msgid "File Containers"
msgstr ""
More information about the tor-commits
mailing list